diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 6e2a0f7..cd25340 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -196,11 +196,10 @@ public class UserAddExe { } }else{ userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode()); - // - if(userDO.getCorpinfoId()!=null){ - throw new BizException("用户已存在企业信息,请勿重复入职"); - } + // 扫码入职时, 固定人员user表企业id变为入职的企业 + userE.setCorpinfoId(cmd.getCorpinfoId()); } + userGateway.update(userE); // 插入user_corp_record表 UserCorpRecordE userCorpRecordE = new UserCorpRecordE(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 7cc68fb..2e4c4af 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -244,6 +244,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i // 默认不是主账号 userDO.setMainCorpFlag(0); userDO.setUserId(UuidUtil.get32UUID()); + // 相关方 + userDO.setCorpinfoId(null); save(userDO); }