From 25c3f09c56adc433562a2286e7e038dbc9f3fb46 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 29 May 2024 17:03:43 +0800 Subject: [PATCH 1/2] getTrainingExperience --- .../impl/TrainingExperienceServiceImpl.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 759989e58..329db143c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -46,10 +46,16 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Resource EnterpriseUserRoleMapper enterpriseUserRoleMapper; + @Resource + UserAuthMappingMapper userAuthMappingMapper; + @Resource private CommonService commonService; + @Resource + RegionMapper regionMapper; + @Override @Transactional(rollbackFor = Exception.class) public boolean distribution(TrainingExperienceDistributionRequest request) { @@ -137,10 +143,18 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr } List xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames); List roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList()); + //店长角色的用户id List userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds); - List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByRoleIdList); - String storeManagers = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); - leaseBaseInfoDO.setStoreManager(storeManagers); + //当前门店 + RegionDO storeRegion = regionMapper.getRegionByStoreId(leaseBaseInfoDO.getStoreId()); + //权限 + List userIdsByMappingIds = userAuthMappingMapper.getUserIdsByMappingIds(Collections.singletonList(storeRegion.getRegionId())); + //过滤 + userIdsByMappingIds.retainAll(userIdsByRoleIdList); + //用户 + List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); + String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); + leaseBaseInfoDO.setStoreManager(nameList); return leaseBaseInfoDO; } From ce5627aaa058c8c870e70e33926b1d582711ed50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 29 May 2024 17:13:25 +0800 Subject: [PATCH 2/2] online --- .../src/main/resources/application-online.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 2b8839188..800a67327 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -32,10 +32,10 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay +oss.bucket=coolstore-storage oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ @@ -60,7 +60,7 @@ fixMobileOpenid=HSAY4AF322E xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin xxl.job.executor.appname = ${spring.application.name} xxl.job.executor.ip = -xxl.job.executor.port = 30201 +xxl.job.executor.port = 40001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 30 xxl.job.accessToken =