suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion

Browse Source
This commit is contained in:
guohb
2024-06-04 21:51:22 +08:00
parent 7ca9535183 9d4a9b1f55
commit bf400ca322
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java
View File

@@ -61,4 +61,6 @@ public class StaffBaseInfoDTO {
@ApiModelProperty("健康证") @ApiModelProperty("健康证")
private String healthCertificate; private String healthCertificate;
private Boolean storeManagerFlag;
} }

11
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
View File

@@ -185,8 +185,17 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
} }
if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) { if (StringUtil.isBlank(enterpriseUserDO.getJobnumber())) {
throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.JOBNUMBER_NOT_EXIST);
} }
return xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber()); StaffBaseInfoDTO userInfoByCode = xfsgEhrService.getUserInfoByCode(enterpriseUserDO.getJobnumber());
//默认是店员
userInfoByCode.setStoreManagerFlag(Boolean.FALSE);
//如果有店长角色 则是店长
List<Long> userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId());
if (CollectionUtils.isNotEmpty(userRoleIds)&&userRoleIds.contains(UserRoleEnum.XFSG_SHOPOWNER.getCode())){
userInfoByCode.setStoreManagerFlag(Boolean.TRUE);
}
return userInfoByCode;
} }
@Override @Override