From 4eba5d151ae6d48bf3f90ed04e0404daa15a86e3 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Fri, 5 Dec 2025 13:45:20 +0800 Subject: [PATCH] =?UTF-8?q?dev:app=E7=AB=AF=E6=B3=A8=E5=86=8C=E5=92=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=85=A5=E8=81=8C=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/basic/info/command/UserAddExe.java | 7 +++---- .../persistence/repository/impl/UserRepositoryImpl.java | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) 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); }