From f3dd491565401f75437ffa73eb808417ef13b1e9 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Fri, 19 Apr 2024 17:53:28 +0800 Subject: [PATCH 1/3] getUserIdByRegionIdWithRolePriority --- .../store/service/impl/SysRoleServiceImpl.java | 15 +++++++++++++++ .../store/controller/webb/SysRoleController.java | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java index fe209742b..8f8113eba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java @@ -1,12 +1,15 @@ package com.cool.store.service.impl; +import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.SysRoleDO; import com.cool.store.enums.Role; import com.cool.store.enums.RoleSourceEnum; import com.cool.store.enums.UserRoleEnum; import com.cool.store.mapper.SysRoleMapper; import com.cool.store.service.SysRoleService; +import com.cool.store.service.UserAuthMappingService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -28,6 +31,9 @@ public class SysRoleServiceImpl implements SysRoleService { @Resource private SysRoleMapper sysRoleMapper; + @Resource + private UserAuthMappingService userAuthMappingService; + @Override public Boolean checkIsAdmin(String userId) { // 1.取出所有用户角色 @@ -50,6 +56,15 @@ public class SysRoleServiceImpl implements SysRoleService { @Override public String getUserIdByRegionIdWithRolePriority(Long regionId, List roleList) { + if(CollectionUtils.isEmpty(roleList)){ + return null; + } + for(UserRoleEnum roleEnum: roleList){ + EnterpriseUserDO enterpriseUserDO = userAuthMappingService.getUserByRoleEnumAndRegionId(roleEnum, regionId); + if(enterpriseUserDO != null){ + return enterpriseUserDO.getUserId(); + } + } return null; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java index 7397b211a..8c751e6f1 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java @@ -1,14 +1,18 @@ package com.cool.store.controller.webb; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.response.ResponseResult; import com.cool.store.service.SysRoleService; +import com.google.common.collect.Lists; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; import java.util.Map; @RestController @@ -24,4 +28,12 @@ public class SysRoleController { return ResponseResult.success(sysRoleService.getXfsgRoles()); } + @GetMapping(path = "/getUserIdByRegionIdWithRolePriority") + public ResponseResult getUserIdByRegionIdWithRolePriority(@RequestParam(value = "regionId", required = true) Long regionId) { + List roleList = Lists.newArrayList(); + roleList.add(UserRoleEnum.THEATER_MANAGER); + roleList.add(UserRoleEnum.OPERATIONS_MANAGER); + roleList.add(UserRoleEnum.REGION_MANAGER); + return ResponseResult.success(sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, roleList)); + } } From 16f228ed045c465d22f6005f066123490dca2290 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Fri, 19 Apr 2024 18:29:51 +0800 Subject: [PATCH 2/3] getUserIdByRegionIdWithRolePriority --- .../com/cool/store/controller/webb/SysRoleController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java index 8c751e6f1..1ba9ddf97 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -30,10 +31,7 @@ public class SysRoleController { @GetMapping(path = "/getUserIdByRegionIdWithRolePriority") public ResponseResult getUserIdByRegionIdWithRolePriority(@RequestParam(value = "regionId", required = true) Long regionId) { - List roleList = Lists.newArrayList(); - roleList.add(UserRoleEnum.THEATER_MANAGER); - roleList.add(UserRoleEnum.OPERATIONS_MANAGER); - roleList.add(UserRoleEnum.REGION_MANAGER); + List roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER); return ResponseResult.success(sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, roleList)); } } From bd196c88028a5369d86664b104c51ec5d453afd6 Mon Sep 17 00:00:00 2001 From: guohb Date: Mon, 22 Apr 2024 09:49:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=88=86=E9=85=8D?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/TrainingExperienceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 7b8ff9ac8..3052f69c7 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 @@ -111,6 +111,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); if (Objects.isNull(leaseBaseInfoDO)) { + leaseBaseInfoDO = new LeaseBaseInfoDO(); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(lineId); if (Objects.nonNull(lineInfoDO) && lineInfoDO.getWorkflowSubStage().equals(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode())