From 9d4a9b1f5522a67619b606cf85106abf8a141554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 4 Jun 2024 21:15:58 +0800 Subject: [PATCH] storeManagerFlag --- .../java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java | 2 ++ .../store/service/impl/TempUserDetailServiceImpl.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java index 9bbb9928d..9ec34bd84 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java @@ -61,4 +61,6 @@ public class StaffBaseInfoDTO { @ApiModelProperty("健康证") private String healthCertificate; + + private Boolean storeManagerFlag; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index 863fd214d..be4bb43ac 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -185,8 +185,17 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { } if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) { throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST); + } - return xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber()); + StaffBaseInfoDTO userInfoByCode = xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber()); + //默认是店员 + userInfoByCode.setStoreManagerFlag(Boolean.FALSE); + //如果有店长角色 则是店长 + List userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId()); + if (CollectionUtils.isNotEmpty(userRoleIds)&&userRoleIds.contains(UserRoleEnum.XFSG_SHOPOWNER.getCode())){ + userInfoByCode.setStoreManagerFlag(Boolean.TRUE); + } + return userInfoByCode; } @Override