zcloud_gbs
/
zcloud_gbs_basic_info_gwj
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

相关方用户第一次注册问题

main
zhaokai 2026-01-08 14:28:02 +08:00
parent 497098a55f
commit e21f581599
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -282,16 +282,17 @@ public class UserAddExe {
} }
UserE userE = new UserE(); UserE userE = new UserE();
UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
if (userDO.getCorpinfoId() == null) { if (userDO.getCorpinfoId() == null) {
BeanUtils.copyProperties(cmd, userE); BeanUtils.copyProperties(cmd, userE);
// user表状态变为入职待审核 // user表状态变为入职待审核
userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode()); userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
userE.setFlowFlag(userExpandInfoDO.getFlowFlag());
userGateway.update(userE); userGateway.update(userE);
} else { } else {
// 用户有企业id // 用户有企业id
UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
Integer flowFlag = userExpandInfoDO.getFlowFlag(); Integer flowFlag = userExpandInfoDO.getFlowFlag();
if (UserFlowFlagEnum.FIXED.getCode().equals(flowFlag)) { if (UserFlowFlagEnum.FIXED.getCode().equals(flowFlag)) {
// 固定用户 // 固定用户

4
web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java
View File

@ -242,7 +242,9 @@ public class UserQueryExe {
//判断用户信息是否完善 //判断用户信息是否完善
UserE userCheck = new UserE(); UserE userCheck = new UserE();
BeanUtils.copyProperties(userDO, userCheck); BeanUtils.copyProperties(userDO, userCheck);
Boolean b = userCheck.checkUserInfoComplete(userCheck); UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
Boolean b = userCheck.checkUserInfoComplete(userCheck,userExpandInfoDO.getFlowFlag());
userLoginCO.setIsInfoComplete(b); userLoginCO.setIsInfoComplete(b);
List<Long> userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList()); List<Long> userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList());

4
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -161,11 +161,11 @@ public class UserE extends BaseE {
// 微信openid // 微信openid
private String openId; private String openId;
public static Boolean checkUserInfoComplete(UserE userE) { public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) {
return StringUtils.isNotEmpty(userE.getUsername()) && return StringUtils.isNotEmpty(userE.getUsername()) &&
StringUtils.isNotEmpty(userE.getPhone()) && StringUtils.isNotEmpty(userE.getPhone()) &&
StringUtils.isNotEmpty(userE.getUserIdCard()) && StringUtils.isNotEmpty(userE.getUserIdCard()) &&
userE.getFlowFlag() != null; flowFlag != null;
} }