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 9221442..208d42a 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 @@ -122,6 +122,7 @@ public class UserAddExe { UserE userE = new UserE(); Long corpinfoId = AuthContext.getTenantId(); + CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpinfoId); // 部门数据 List 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); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java index 779980c..f9961b9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java +++ b/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); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java index dbc5157..33388e8 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java +++ b/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); } } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 4147543..3c7283b 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/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()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 17fbc70..9a0d899 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/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 corpId = unitFacade.add(ouac);