zcloud_gbs
/
zcloud_gbs_basic_info_gwj
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

dev_xiangguanfang
SondonYong 2025-12-30 09:46:38 +08:00
parent bb9e2d7eae bcdfa1f26e
commit 393897a34c
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
@ -73,14 +74,11 @@ public class UserRemoveExe {
try { try {
//TODO 处理所有未完成的工作，如果是非固定人员，包括所有企业的未完成工作 //TODO 处理所有未完成的工作，如果是非固定人员，包括所有企业的未完成工作
// 如果是固定人员，判断是否离职 // 如果是固定人员，判断是否离职
if(UserFlowFlagEnum.FIXED.equals(userDO.getEmploymentFlag().toString())&&UserEmploymentFlagEnum.ON.equals(userDO.getEmploymentFlag().toString())){ List<UserDO> userDOList = userRepository.getListByPhone(userDO.getPhone());
//过滤出固定人员
List<UserDO> fixedUserDOList = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.equals(userDO1.getEmploymentFlag().toString())).collect(Collectors.toList());
if(CollUtil.isNotEmpty(fixedUserDOList)){
throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职"); throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职");
}else if(UserFlowFlagEnum.FLOW.equals(userDO.getEmploymentFlag().toString())){
List<UserCorpDO> userCorpDOS = userCorpRepository.getONCorpInfo(cmd.getId());
if(CollUtil.isNotEmpty(userCorpDOS)){
throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职");
}
} }
// 删除用户表 // 删除用户表

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserCorpInfoDO.java
View File

@ -24,7 +24,7 @@ public class UserCorpInfoDO implements Serializable {
//企业名称 //企业名称
@ApiModelProperty(value = "企业名称") @ApiModelProperty(value = "企业名称")
private String corpinfoName; private String corpName;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")

4
web-infrastructure/src/main/resources/mapper/UserMapper.xml
View File

@ -344,10 +344,10 @@
</select> </select>
<select id="getListByUserIds" resultType="com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO"> <select id="getListByUserIds" resultType="com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO">
select u.id as userId, ci.corp_name as corpinfoName,ci.id as corpinfoId select u.id as userId, ci.corp_name as corpName,ci.id as corpinfoId
from user u from user u
left join corp_info ci on u.corpinfo_id = ci.id left join corp_info ci on u.corpinfo_id = ci.id
where u.user_id in where u.id in
<foreach collection="userIds" item="item" open="(" close=")" separator=","> <foreach collection="userIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>