修改新增用户默认值

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

@@ -122,6 +122,7 @@ public class UserAddExe {
         UserE userE = new UserE();
         Long corpinfoId = AuthContext.getTenantId();
 
+        CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpinfoId);
         // 部门数据
         List<DepartmentDO> departmentDOList = departmentRepository.listByCorpInfoId(corpinfoId);
         // 岗位数据
@@ -140,6 +141,16 @@ public class UserAddExe {
                 BeanUtil.copyToList(postDOList, PostE.class),
                 BeanUtil.copyToList(userDOList, UserE.class),
                 dictMap);
+        for (UserE uE : userEList){
+            userGateway.add(uE);
+            String corpName = null;
+            if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){
+                corpName = corpInfoDO.getCorpName();
+            }
+            UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
+            userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId());
+            userEmploymentLogGateway.add(userEmploymentLogE);
+        }
         // todo 批量插入用户
         System.out.println(userEList);
     }

web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java

@@ -30,6 +30,7 @@ public class UserRemoveExe {
         try {
             userGateway.deletedUserById(id);
         } catch (Exception e){
+            e.printStackTrace();
             throw new BizException("删除失败");
         }
       //  zcloudRedisUtil.del(Const.REDIS_USER_PREFIX+id);

web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java

@@ -63,6 +63,8 @@ public class DepartmentE extends BaseE {
         this.setId(corpInfoId);
         this.setCorpinfoId(corpInfoId);
         this.setParentId(corpInfoId);
+        this.setTenantId(corpInfoId);
+        this.setOrgId(corpInfoId);
         this.setName(corpName);
     }
 }

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

@@ -325,6 +325,8 @@ public class UserE extends BaseE {
         this.setDepartmentId(departmentId);
         this.setUserType(CorpTypeEnum.getUserTypeByCode(examTypeE.getType()));
         this.setCorpinfoId(corpInfoId);
+        this.setOrgId(examTypeE.getTenantId());
+        this.setTenantId(examTypeE.getTenantId());
     }
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -7,6 +7,8 @@ import com.alibaba.cola.dto.SingleResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.jjb.saas.system.client.tenant.facade.TenantFacade;
@@ -71,11 +73,18 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
     public void saveCorp(CorpInfoDO corpInfoDO) {
         OpeUnitAddCmd ouac = new OpeUnitAddCmd();
         ouac.setTenantName(corpInfoDO.getCorpName());
-        ouac.setTenantTypeId(1989262038388776960L);
+        //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
+        if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){
+            ouac.setTenantTypeId(1990693345743208448L);
+        } else if (corpInfoDO.getType() == 3 || corpInfoDO.getType() == 4 || corpInfoDO.getType() == 5){
+            ouac.setTenantTypeId(1990693388072124416L);
+        }
         // LocalDate
         ouac.setEffectiveDate(LocalDate.of(2099, 12, 31));
         ouac.setAccount(corpInfoDO.getCorpName());
-        ouac.setTenantId(corpInfoDO.getParentTenantId());
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        Long tenantId = ssoUser.getTenantId();
+        ouac.setTenantId(tenantId);
         ouac.setPassword(corpInfoDO.getPassword());
         try {
             SingleResponse<Long> corpId = unitFacade.add(ouac);