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

相关方入职离职

dev_xiangguanfang
zhaokai 2025-12-29 16:14:50 +08:00
parent d7cca04f8f
commit b78a92f630
5 changed files with 102 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,14 +319,6 @@ public class UserAddExe {
throw new BizException("保存失败"); throw new BizException("保存失败");
} }
if(UserFlowFlagEnum.FLOW.getCode().equals(cmd.getFlowFlag())){
//流动人员
UserCorpE userCorpE = new UserCorpE();
// BeanUtils.copyProperties(userE, userCorpE);
// userCorpE.setCorpinfoId(tenantId);
userCorpE.initAdd(tenantId, userE);
userCorpGateway.add(userCorpE);
}
//页面相关保存user_corp //页面相关保存user_corp
/** /**
* 非流动人员用户只能在一个企业， * 非流动人员用户只能在一个企业，

64
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -26,14 +26,8 @@ import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade;
import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsListQry; import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsListQry;
import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd; import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd;
import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO; import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO;
import com.zcloud.gbscommon.zcloudhidden.response.HiddenListCO;
import com.zcloud.gbscommon.zcloudrisk.facade.ZcloudRiskFacade; import com.zcloud.gbscommon.zcloudrisk.facade.ZcloudRiskFacade;
import com.zcloud.gbscommon.zcloudrisk.request.ListManagerQry;
import com.zcloud.gbscommon.zcloudrisk.request.ListManagerStatusUpdateCmd; import com.zcloud.gbscommon.zcloudrisk.request.ListManagerStatusUpdateCmd;
import com.zcloud.gbscommon.zcloudrisk.response.ListManagerListByUserCO;
import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserJobFacade;
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserJobQry;
import com.zcloud.gbscommon.zclouduser.response.ZcloudUserJobCo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.User; import org.apache.catalina.User;
@ -193,28 +187,18 @@ public class UserUpdateExe {
BeanUtils.copyProperties(cmd, userDO); BeanUtils.copyProperties(cmd, userDO);
return userRepository.updateFaceUrl(userDO); return userRepository.updateFaceUrl(userDO);
} }
@Transactional(rollbackFor = Exception.class)
public void executeResignation(UserResignationCmd userResignationCmd) { public void executeResignation(UserResignationCmd userResignationCmd) {
//获取用户信息,并更新离职状态为离职 //获取用户信息,并更新离职状态为离职
UserDO userDO = userRepository.getInfoById(userResignationCmd.getUserId()); UserDO userDO = userRepository.getInfoById(userResignationCmd.getUserId());
// //
UserE userE = null; UserE userE = null;
Long corpinfoId = userResignationCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userResignationCmd.getCorpinfoId(); Long corpinfoId = userResignationCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userResignationCmd.getCorpinfoId();
Integer employmentFlagBefore; userE = new UserE();
if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { BeanUtils.copyProperties(userDO, userE);
UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userDO.getId(), corpinfoId); Integer employmentFlagBefore = userDO.getEmploymentFlag();
if (userCorpDO == null) { userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION.getCode());
return; userGateway.update(userE);
}
employmentFlagBefore = userCorpDO.getEmploymentFlag();
userE = userCorpRepository.executeResignation(userCorpDO, corpinfoId, UserEmploymentFlagEnum.RESIGNATION.getCode());
} else {
userE = new UserE();
BeanUtils.copyProperties(userDO, userE);
employmentFlagBefore = userDO.getEmploymentFlag();
userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION.getCode());
userGateway.update(userE);
}
if (userE == null) { if (userE == null) {
return; return;
} }
@ -253,6 +237,7 @@ public class UserUpdateExe {
} }
@Transactional(rollbackFor = Exception.class)
public void executeReviewStatus(UserReviewStatusCmd userReviewStatusCmd) { public void executeReviewStatus(UserReviewStatusCmd userReviewStatusCmd) {
//获取用户信息,并更新审核状态 //获取用户信息,并更新审核状态
UserDO userDO = userRepository.getInfoById(userReviewStatusCmd.getUserId()); UserDO userDO = userRepository.getInfoById(userReviewStatusCmd.getUserId());
@ -278,17 +263,17 @@ public class UserUpdateExe {
Integer employmentFlag = UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus) ? UserEmploymentFlagEnum.RESIGNATION.getCode() : UserEmploymentFlagEnum.ON.getCode(); Integer employmentFlag = UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus) ? UserEmploymentFlagEnum.RESIGNATION.getCode() : UserEmploymentFlagEnum.ON.getCode();
UserE userE = null; UserE userE = null;
Long corpinfoId = userReviewStatusCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userReviewStatusCmd.getCorpinfoId(); Long corpinfoId = userReviewStatusCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userReviewStatusCmd.getCorpinfoId();
if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { /* if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) {
userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag); userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag);
} else { } else {*/
userE = new UserE(); userE = new UserE();
BeanUtils.copyProperties(userDO, userE); BeanUtils.copyProperties(userDO, userE);
userE.setEmploymentFlag(employmentFlag); userE.setEmploymentFlag(employmentFlag);
userGateway.update(userE); userGateway.update(userE);
} // }
if (userE == null) { // if (userE == null) {
return; // return;
} // }
UserE userEOld = new UserE(); UserE userEOld = new UserE();
BeanUtils.copyProperties(userDO, userEOld); BeanUtils.copyProperties(userDO, userEOld);
if (UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus)) { if (UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus)) {
@ -344,14 +329,14 @@ public class UserUpdateExe {
Integer employmentFlag = UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus) ? UserEmploymentFlagEnum.ON.getCode() : UserEmploymentFlagEnum.NOT_ON.getCode(); Integer employmentFlag = UserChangeRecordStatusEnum.APPROVED.getCode().equals(reviewStatus) ? UserEmploymentFlagEnum.ON.getCode() : UserEmploymentFlagEnum.NOT_ON.getCode();
UserE userE = null; UserE userE = null;
Long corpinfoId = userReviewStatusCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userReviewStatusCmd.getCorpinfoId(); Long corpinfoId = userReviewStatusCmd.getCorpinfoId() == null ? AuthContext.getTenantId() : userReviewStatusCmd.getCorpinfoId();
if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) { /* if (UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())) {
userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag); userE = userCorpRepository.executeReviewStatus(userDO.getId(), corpinfoId, employmentFlag);
} else { } else {*/
userE = new UserE(); userE = new UserE();
BeanUtils.copyProperties(userDO, userE); BeanUtils.copyProperties(userDO, userE);
userE.setEmploymentFlag(employmentFlag); userE.setEmploymentFlag(employmentFlag);
userGateway.update(userE); userGateway.update(userE);
} // }
if (userE == null) { if (userE == null) {
return; return;
} }
@ -385,7 +370,8 @@ public class UserUpdateExe {
userAddCmd.setRoleDepts(roleDeptAddCmdList); userAddCmd.setRoleDepts(roleDeptAddCmdList);
// userAddCmd.setTenantId(userDO.getCorpinfoId()); // userAddCmd.setTenantId(userDO.getCorpinfoId());
userAddCmd.setPassword(userDO.getPassword()); userAddCmd.setPassword(userDO.getPassword());
log.info("GBS入职处理开始,用户id:{}", userDO.getId()); userAddCmd.setId(userDO.getId());
log.info("GBS入职处理开始,用户id:{},请求参数:{}", userDO.getId(), JSONUtil.toJsonStr(userAddCmd));
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd); SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
log.info("GBS入职处理结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(gbsResult)); log.info("GBS入职处理结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(gbsResult));
userDO.setId(gbsResult.getData()); userDO.setId(gbsResult.getData());
@ -523,14 +509,14 @@ public class UserUpdateExe {
userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId()); userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId());
//隐患出异常是直接抛异常 //隐患出异常是直接抛异常
break; break;
case RISK: // case RISK:
ListManagerStatusUpdateCmd riskCmd = new ListManagerStatusUpdateCmd(); // ListManagerStatusUpdateCmd riskCmd = new ListManagerStatusUpdateCmd();
riskCmd.setUserId(info.getUserId()); // riskCmd.setUserId(info.getUserId());
riskCmd.setCorpinfoId(info.getCorpinfoId()); // riskCmd.setCorpinfoId(info.getCorpinfoId());
zcloudRiskFacade.updateListManagerStatusByUserId(riskCmd); // zcloudRiskFacade.updateListManagerStatusByUserId(riskCmd);
userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId()); // userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId());
//风险辨识检查出异常是直接抛异常 //风险辨识检查出异常是直接抛异常
break; // break;
} }
}); });

1
web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java
View File

@ -63,7 +63,6 @@ public class UserCorpRecordQueryExe {
return null; return null;
} }
UserCorpRecordCO userCorpRecordCO = userCorpRecordCoConvertor.convertDOToCO(userCorpRecordDO);
//补充用户信息 //补充用户信息
Long userId = userCorpRecordDO.getUserId(); Long userId = userCorpRecordDO.getUserId();
UserDO userDO = userRepository.getInfoById(userId); UserDO userDO = userRepository.getInfoById(userId);

122
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
View File

@ -1,5 +1,6 @@
package com.zcloud.basic.info.persistence.repository.impl; package com.zcloud.basic.info.persistence.repository.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.Response;
@ -94,9 +95,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
// handelTaskAddCmd.setBusCode("wowowowo"); // handelTaskAddCmd.setBusCode("wowowowo");
// busTodoTaskFacade.handleTask(handelTaskAddCmd); // busTodoTaskFacade.handleTask(handelTaskAddCmd);
if(params.get("inDepartmentId") != null){ if (params.get("inDepartmentId") != null) {
Long[] inDepartmentIds = (Long[]) params.get("inDepartmentId"); Long[] inDepartmentIds = (Long[]) params.get("inDepartmentId");
if(inDepartmentIds == null || inDepartmentIds.length == 0){ if (inDepartmentIds == null || inDepartmentIds.length == 0) {
params.remove("inDepartmentId"); params.remove("inDepartmentId");
} }
} }
@ -105,13 +106,13 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u."); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u.");
queryWrapper.eq("u.delete_enum", "FALSE"); queryWrapper.eq("u.delete_enum", "FALSE");
if(!ObjectUtils.isEmpty(params.get("noMain"))){ if (!ObjectUtils.isEmpty(params.get("noMain"))) {
queryWrapper.apply("u.id != u.corpinfo_id"); queryWrapper.apply("u.id != u.corpinfo_id");
} }
queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
String menuPerms = ""; String menuPerms = "";
if (!ObjectUtils.isEmpty(params.get("menuPath"))){ if (!ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
} }
IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper, menuPerms); IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper, menuPerms);
@ -149,7 +150,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
public Long getCountByCorpInfoId(Long id) { public Long getCountByCorpInfoId(Long id) {
QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("corpinfo_id", id); queryWrapper.eq("corpinfo_id", id);
queryWrapper.ne("id",id); queryWrapper.ne("id", id);
return userMapper.selectCount(queryWrapper); return userMapper.selectCount(queryWrapper);
} }
@ -183,7 +184,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public Response countUser(Map<String, Object> params) { public Response countUser(Map<String, Object> params) {
if (!ObjectUtils.isEmpty(params.get("username"))){ if (!ObjectUtils.isEmpty(params.get("username"))) {
Map<String, Object> verifyParam = new HashMap<>(); Map<String, Object> verifyParam = new HashMap<>();
verifyParam.put("username", params.get("username")); verifyParam.put("username", params.get("username"));
verifyParam.put("id", params.get("id")); verifyParam.put("id", params.get("id"));
@ -192,7 +193,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
return Response.buildFailure("用户名已经存在，请联系管理员"); return Response.buildFailure("用户名已经存在，请联系管理员");
} }
} }
if (!ObjectUtils.isEmpty(params.get("phone"))){ if (!ObjectUtils.isEmpty(params.get("phone"))) {
Map<String, Object> verifyParam = new HashMap<>(); Map<String, Object> verifyParam = new HashMap<>();
verifyParam.put("phone", params.get("phone")); verifyParam.put("phone", params.get("phone"));
verifyParam.put("id", params.get("id")); verifyParam.put("id", params.get("id"));
@ -201,7 +202,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
return Response.buildFailure("手机号已经存在，请联系管理员"); return Response.buildFailure("手机号已经存在，请联系管理员");
} }
} }
if (!ObjectUtils.isEmpty(params.get("userIdCard"))){ if (!ObjectUtils.isEmpty(params.get("userIdCard"))) {
Map<String, Object> verifyParam = new HashMap<>(); Map<String, Object> verifyParam = new HashMap<>();
verifyParam.put("userIdCard", params.get("userIdCard")); verifyParam.put("userIdCard", params.get("userIdCard"));
verifyParam.put("id", params.get("id")); verifyParam.put("id", params.get("id"));
@ -256,7 +257,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public void saveUser(UserDO userDO) { public void saveUser(UserDO userDO) {
if(StringUtils.isEmpty(userDO.getUsername())){ if (StringUtils.isEmpty(userDO.getUsername())) {
userDO.setUsername(userDO.getPhone()); userDO.setUsername(userDO.getPhone());
} }
UserAddCmd userAddCmd = new UserAddCmd(); UserAddCmd userAddCmd = new UserAddCmd();
@ -270,7 +271,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd); SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
userDO.setId(gbsResult.getData()); userDO.setId(gbsResult.getData());
if(userDO.getSort() == null){ if (userDO.getSort() == null) {
userDO.setSort(9999); userDO.setSort(9999);
} }
// 新增用户默认在职 // 新增用户默认在职
@ -280,16 +281,16 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public void saveRegisterUser(UserDO userDO) { public void saveRegisterUser(UserDO userDO) {
if(StringUtils.isEmpty(userDO.getUsername())){ if (StringUtils.isEmpty(userDO.getUsername())) {
userDO.setUsername(userDO.getPhone()); userDO.setUsername(userDO.getPhone());
} }
// userDO.setId(Tools); // userDO.setId(Tools);
if(userDO.getSort() == null){ if (userDO.getSort() == null) {
userDO.setSort(9999); userDO.setSort(9999);
} }
// 新增用户默认入职待审核 // 新增用户默认入职待审核
// userDO.setEmploymentFlag(11); // userDO.setEmploymentFlag(11);
// 默认不是主账号 // 默认不是主账号
userDO.setMainCorpFlag(0); userDO.setMainCorpFlag(0);
userDO.setUserId(Tools.get32UUID()); userDO.setUserId(Tools.get32UUID());
@ -300,38 +301,22 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public void saveUserXgf(UserDO userDO) { public void saveUserXgf(UserDO userDO) {
if(StringUtils.isEmpty(userDO.getUsername())){ if (StringUtils.isEmpty(userDO.getUsername())) {
userDO.setUsername(userDO.getPhone()); userDO.setUsername(userDO.getPhone());
} }
//TODO 流动人员同步gbs需要指定特殊tenantId
// if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){
// FacadeUserRegisterCmd facadeUserRegisterCmd = new FacadeUserRegisterCmd();
// facadeUserRegisterCmd.setAccount(userDO.getUsername());
// facadeUserRegisterCmd.setName(userDO.getName());
// facadeUserRegisterCmd.setMobile(userDO.getPhone());
// facadeUserRegisterCmd.setPassword(userDO.getPassword());
// facadeUserRegisterCmd.setTenantId(1111111L);
// facadeUserRegisterCmd.setAppKey("");
// facadeUserRegisterCmd.setOrgId(11111L);
//// facadeUserRegisterCmd.setRoleCodes(Collections.singletonList(userDO.getRoleId()));
//
// SingleResponse<Long> register = userFacade.register(facadeUserRegisterCmd);
// userDO.setId(register.getData());
// userDO.setCorpinfoId(null);
// }else{
UserAddCmd userAddCmd = new UserAddCmd();
userAddCmd.setAccount(userDO.getUsername());
userAddCmd.setName(userDO.getName());
RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd();
roleDeptAddCmd.setRoleId(userDO.getRoleId());
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
userAddCmd.setRoleDepts(roleDeptAddCmdList);
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
userDO.setId(gbsResult.getData());
// }
if(userDO.getSort() == null){ UserAddCmd userAddCmd = new UserAddCmd();
userAddCmd.setAccount(userDO.getUsername());
userAddCmd.setName(userDO.getName());
RoleDeptAddCmd roleDeptAddCmd = new RoleDeptAddCmd();
roleDeptAddCmd.setRoleId(userDO.getRoleId());
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
userAddCmd.setRoleDepts(roleDeptAddCmdList);
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
userDO.setId(gbsResult.getData());
if (userDO.getSort() == null) {
userDO.setSort(9999); userDO.setSort(9999);
} }
@ -361,24 +346,42 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public void changePassword(Long id, String password) { public void changePassword(Long id, String password) {
//修改这个手机号下所有密码
UserDO userDO = getById( id);
if(userDO==null){
return;
}
String phone = userDO.getPhone();
if(StringUtils.isEmpty( phone)){
userChangePassword(id, password);
}else{
List<UserDO> userDOList = list(new QueryWrapper<UserDO>().eq("phone", phone));
for (UserDO userDO1 : userDOList) {
userChangePassword(userDO1.getId(), password);
}
}
}
private void userChangePassword(Long id, String password) {
//更新本地密码 //更新本地密码
UserDO userDOUpdate = new UserDO(); UserDO userDOUpdate = new UserDO();
userDOUpdate.setId(id); userDOUpdate.setId(id);
userDOUpdate.setPassword(password); userDOUpdate.setPassword(password);
updateById(userDOUpdate); updateById(userDOUpdate);
//更新gbs密码 //更新gbs密码
UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd(); UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd();
userUpdatePasswordCmd.setId(id); userUpdatePasswordCmd.setId(id);
userUpdatePasswordCmd.setPassword(password); userUpdatePasswordCmd.setPassword(password);
log.info("更新用户密码id：{}", id);
Response response = userFacade.updatePassword(userUpdatePasswordCmd); Response response = userFacade.updatePassword(userUpdatePasswordCmd);
log.info("更新密码结果：{}", response); log.info("更新密码结果：{}", response);
} }
@Override @Override
public void updateUserName(UserDO userDO) { public void updateUserName(UserDO userDO) {
updateById(userDO); updateById(userDO);
if (!ObjectUtils.isEmpty(userDO.getName())){ if (!ObjectUtils.isEmpty(userDO.getName())) {
UserUpdateCmd userUpdateCmd = new UserUpdateCmd(); UserUpdateCmd userUpdateCmd = new UserUpdateCmd();
userUpdateCmd.setId(userDO.getId()); userUpdateCmd.setId(userDO.getId());
userUpdateCmd.setName(userDO.getName()); userUpdateCmd.setName(userDO.getName());
@ -398,10 +401,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public Long getDefaultRoleId() { public Long getDefaultRoleId() {
MultiResponse<RoleCO> multiResponse = roleFacade.listRoles(); MultiResponse<RoleCO> multiResponse = roleFacade.listRoles();
if (multiResponse.isSuccess()){ if (multiResponse.isSuccess()) {
List<RoleCO> roleCOList = multiResponse.getData(); List<RoleCO> roleCOList = multiResponse.getData();
for (RoleCO roleCO : roleCOList) { for (RoleCO roleCO : roleCOList) {
if ("默认通用角色".equals(roleCO.getRoleName())){ if ("默认通用角色".equals(roleCO.getRoleName())) {
return roleCO.getId(); return roleCO.getId();
} }
} }
@ -412,7 +415,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public Map<String, Long> getRoleMap() { public Map<String, Long> getRoleMap() {
MultiResponse<RoleCO> multiResponse = roleFacade.listRoles(); MultiResponse<RoleCO> multiResponse = roleFacade.listRoles();
if (multiResponse.isSuccess()){ if (multiResponse.isSuccess()) {
return multiResponse.getData().stream() return multiResponse.getData().stream()
.collect(Collectors.toMap(RoleCO::getRoleName, RoleCO::getId)); .collect(Collectors.toMap(RoleCO::getRoleName, RoleCO::getId));
@ -423,16 +426,27 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public Response updatePassword(UserDO userDO) { public Response updatePassword(UserDO userDO) {
// TODO 验证老密码是否正确 // TODO 验证老密码是否正确
if(userDO.getPassword() != null && !userDO.getPassword().equals("")){ if (userDO.getPassword() != null && !userDO.getPassword().equals("")) {
AccountPasswordCheckCmd accountPasswordCheckCmd = new AccountPasswordCheckCmd(); AccountPasswordCheckCmd accountPasswordCheckCmd = new AccountPasswordCheckCmd();
accountPasswordCheckCmd.setUserId(userDO.getId()); accountPasswordCheckCmd.setUserId(userDO.getId());
accountPasswordCheckCmd.setPassword(userDO.getPassword()); accountPasswordCheckCmd.setPassword(userDO.getPassword());
SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd); SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
if(!response.isSuccess()){ if (!response.isSuccess()) {
return Response.buildFailure("原密码不正确"); return Response.buildFailure("原密码不正确");
} }
} }
//更新本地密码 //修改多个密码
String phone = userDO.getPhone();
if(StringUtils.isEmpty( phone)){
userChangePassword(userDO.getId(), userDO.getNewPassword());
}else{
List<UserDO> userDOList = list(new QueryWrapper<UserDO>().eq("phone", phone));
for (UserDO userDO1 : userDOList) {
userChangePassword(userDO1.getId(), userDO.getNewPassword());
}
}
return Response.buildSuccess();
/* //更新本地密码
UserDO userDOUpdate = new UserDO(); UserDO userDOUpdate = new UserDO();
userDOUpdate.setId(userDO.getId()); userDOUpdate.setId(userDO.getId());
userDOUpdate.setPassword(userDO.getNewPassword()); userDOUpdate.setPassword(userDO.getNewPassword());
@ -442,7 +456,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd(); UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd();
userUpdatePasswordCmd.setId(userDO.getId()); userUpdatePasswordCmd.setId(userDO.getId());
userUpdatePasswordCmd.setPassword(userDO.getNewPassword()); userUpdatePasswordCmd.setPassword(userDO.getNewPassword());
return userFacade.updatePassword(userUpdatePasswordCmd); return userFacade.updatePassword(userUpdatePasswordCmd);*/
} }
@Override @Override
@ -464,7 +478,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
accountPasswordCheckCmd.setUserId(AuthContext.getUserId()); accountPasswordCheckCmd.setUserId(AuthContext.getUserId());
accountPasswordCheckCmd.setPassword(userE.getPassword()); accountPasswordCheckCmd.setPassword(userE.getPassword());
SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd); SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
if(!response.isSuccess()){ if (!response.isSuccess()) {
throw new BizException("密码错误"); throw new BizException("密码错误");
} }
return getById(userE.getId()); return getById(userE.getId());
@ -477,7 +491,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
accountPasswordCheckCmd.setUserId(AuthContext.getUserId()); accountPasswordCheckCmd.setUserId(AuthContext.getUserId());
accountPasswordCheckCmd.setPassword(password); accountPasswordCheckCmd.setPassword(password);
SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd); SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
if(!response.isSuccess()){ if (!response.isSuccess()) {
return false; return false;
} }
return true; return true;
@ -487,7 +501,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
public PageResponse<UserDO> listXgf(Map<String, Object> params) { public PageResponse<UserDO> listXgf(Map<String, Object> params) {
IPage<UserDO> iPage = new Query<UserDO>().getPage(params); IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
String menuPerms = ""; String menuPerms = "";
if (!ObjectUtils.isEmpty(params.get("menuPath"))){ if (!ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
} }
IPage<UserDO> result = userMapper.listXgf(iPage, params, menuPerms); IPage<UserDO> result = userMapper.listXgf(iPage, params, menuPerms);

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

@ -301,72 +301,29 @@
u.sort AS sort, u.sort AS sort,
u.department_leader_flag AS departmentLeaderFlag, u.department_leader_flag AS departmentLeaderFlag,
u.flow_flag AS flowFlag, u.flow_flag AS flowFlag,
cp.user_corp_id as userCorpId, u.employment_flag AS employmentFlag,
CASE ud.name AS departmentName,
WHEN u.flow_flag = 0 THEN u.employment_flag cu.corp_name AS corpName,
WHEN u.flow_flag = 1 THEN cp.employment_flag u.department_id AS departmentId,
END AS employmentFlag, u.corpinfo_id AS corpinfoId
CASE
WHEN u.flow_flag = 0 THEN ud.name
WHEN u.flow_flag = 1 THEN cpd.name
END AS departmentName,
CASE
WHEN u.flow_flag = 0 THEN cu.corp_name
WHEN u.flow_flag = 1 THEN ccp.corp_name
END AS corpName,
CASE
WHEN u.flow_flag = 0 THEN u.department_id
WHEN u.flow_flag = 1 THEN cp.department_id
END AS departmentId,
CASE
WHEN u.flow_flag = 0 THEN u.corpinfo_id
WHEN u.flow_flag = 1 THEN cp.corpinfo_id
END AS corpinfoId
FROM FROM
user u user u
LEFT JOIN user_corp cp ON u.id = cp.user_id AND cp.delete_enum = 'FALSE'
LEFT JOIN department ud ON u.department_id = ud.id LEFT JOIN department ud ON u.department_id = ud.id
LEFT JOIN department cpd ON cp.department_id = cpd.id
AND cpd.delete_enum = 'FALSE'
AND cp.corpinfo_id = cpd.corpinfo_id
LEFT JOIN corp_info cu ON u.corpinfo_id = cu.id LEFT JOIN corp_info cu ON u.corpinfo_id = cu.id
LEFT JOIN corp_info ccp ON cp.corpinfo_id = ccp.id
WHERE WHERE
( u.id != u.corpinfo_id
u.corpinfo_id IS NULL
OR u.corpinfo_id = ''
OR u.id != u.corpinfo_id
)
AND u.delete_enum = 'FALSE' AND u.delete_enum = 'FALSE'
<if test="params.eqCorpinfoId != null"> <if test="params.eqCorpinfoId != null">
AND ( AND u.corpinfo_id = #{params.eqCorpinfoId} and u.employment_flag !='3'
(u.flow_flag = 0 AND u.corpinfo_id = #{params.eqCorpinfoId} and u.employment_flag !='3')
OR
(u.flow_flag = 1 AND cp.corpinfo_id = #{params.eqCorpinfoId} and cp.employment_flag !='3')
)
</if> </if>
<if test="params.eqDepartmentId != null and params.eqDepartmentId != ''"> <if test="params.eqDepartmentId != null and params.eqDepartmentId != ''">
AND ( AND u.department_id = #{params.eqDepartmentId}
(u.flow_flag = 0 AND u.department_id = #{params.eqDepartmentId} )
OR
(u.flow_flag = 1 AND cp.id = #{params.eqDepartmentId} )
)
</if> </if>
<if test="params.inDepartmentId != null and params.inDepartmentId.length > 0"> <if test="params.inDepartmentId != null and params.inDepartmentId.length > 0">
AND ( u.department_id IN
(u.flow_flag = 0 AND u.department_id IN
<foreach collection="params.inDepartmentId" item="departmentId" open="(" close=")" separator=","> <foreach collection="params.inDepartmentId" item="departmentId" open="(" close=")" separator=",">
#{departmentId} #{departmentId}
</foreach> </foreach>
)
OR
(u.flow_flag = 1 AND cp.id IN
<foreach collection="params.inDepartmentId" item="departmentId" open="(" close=")" separator=",">
#{departmentId}
</foreach>
)
)
</if> </if>
<if test="params.likeName != null and params.likeName != ''"> <if test="params.likeName != null and params.likeName != ''">
AND u.name LIKE CONCAT('%', #{params.likeName}, '%') AND u.name LIKE CONCAT('%', #{params.likeName}, '%')
@ -378,7 +335,6 @@
AND u.employment_flag = #{params.eqEmploymentFlag} AND u.employment_flag = #{params.eqEmploymentFlag}
</if> </if>
ORDER BY ORDER BY
u.sort ASC, u.create_time DESC u.sort ASC, u.create_time DESC