diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 47f91e2..8bd85bc 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -7,6 +7,7 @@ import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.system.client.user.facade.UserFacade; +import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; import com.jjb.saas.system.enums.user.UserAuditStatusEnum; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.command.convertor.UserJobHandoverCoConvertor; @@ -38,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; @@ -358,6 +360,19 @@ public class UserUpdateExe { userCorpRecordE.setStartTime( LocalDateTime.now()); userChangeRecordGateway.add(userChangeRecordE); + com.jjb.saas.system.client.user.request.UserAddCmd userAddCmd = new com.jjb.saas.system.client.user.request.UserAddCmd(); + userAddCmd.setAccount(userDO.getPhone()); + userAddCmd.setMobile(userDO.getPhone()); + RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd(); + roleDeptAddCmd.setRoleId(1994326788804837377L); + roleDeptAddCmd.setDeptId(userDO.getDepartmentId()); + List roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd); + userAddCmd.setRoleDepts(roleDeptAddCmdList); + userAddCmd.setTenantId(userDO.getCorpinfoId()); + + SingleResponse gbsResult = userFacade.add(userAddCmd); + userDO.setId(gbsResult.getData()); + //TODO 通知GBS用户绑定租户,底座尚不支持用户绑定多个租户 } else { 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 5ffbc5a..85c8a04 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 @@ -278,18 +278,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i if(StringUtils.isEmpty(userDO.getUsername())){ userDO.setUsername(userDO.getPhone()); } - UserAddCmd userAddCmd = new UserAddCmd(); - userAddCmd.setAccount(userDO.getPhone()); - userAddCmd.setMobile(userDO.getPhone()); - RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd(); - roleDeptAddCmd.setRoleId(1994326788804837377L); - roleDeptAddCmd.setDeptId(userDO.getDepartmentId()); - List roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd); - userAddCmd.setRoleDepts(roleDeptAddCmdList); - userAddCmd.setTenantId(userDO.getCorpinfoId()); - - SingleResponse gbsResult = userFacade.add(userAddCmd); - userDO.setId(gbsResult.getData()); + +// userDO.setId(Tools); if(userDO.getSort() == null){ userDO.setSort(9999); }