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 8ce41a87..d2407b6b 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 @@ -3,8 +3,10 @@ package com.zcloud.basic.info.command; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.jjb.saas.system.client.user.facade.UserFacade; +import com.jjb.saas.system.client.user.response.UserDetailCO; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.gateway.UserGateway; @@ -57,11 +59,11 @@ public class UserRemoveExe { UserDO userDO = userRepository.getById(cmd.getId()); // 获取redis验证码 - Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); + /* Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ throw new BizException("验证码已过期或错误"); } - zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); + zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());*/ try { //TODO 处理所有未完成的工作,如果是非固定人员,包括所有企业的未完成工作 @@ -72,14 +74,29 @@ public class UserRemoveExe { if(CollUtil.isNotEmpty(userDOList)){ throw new BizException("您目前还有未离职信息,无法直接注销,请先在\"就职单位\"页面中离职"); } - + List userDOListALl = userRepository.getListByPhone(userDO.getPhone(),null); // 删除用户表 Long userId = cmd.getId(); - userGateway.deletedUserById(userId); + userGateway.deletedUserByPhone(userDO.getPhone()); + + + userDOListALl.forEach(info -> { + SingleResponse detail=null; + try { + log.info("updateXgf,GBS获取用户信息{}", info.getId()); + detail = userFacade.getDetail(info.getId()); + log.info("updateXgf,GBS获取用户信息返回: {}", JSONUtil.toJsonStr(detail)); + + if(detail.getData() != null){ + log.info("删除底座用户信息,userId:{}",info.getId()); + Response delete = userFacade.delete(info.getId()); + log.info("删除底座用户信息,userId:{},返回结果:{}",info.getId(), JSONUtil.toJsonStr( delete)); + } + } catch (Exception e) { + log.error("updateXgf,GBS删除用户失败: {}", e.getMessage()); + } + }); - log.info("删除底座用户信息,userId:{}",userId); - Response delete = userFacade.delete(cmd.getId()); - log.info("删除底座用户信息,userId:{},返回结果:{}",userId, JSONUtil.toJsonStr( delete)); } catch (Exception e){ e.printStackTrace(); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java index baae6b0f..998ffd3d 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java @@ -57,5 +57,6 @@ public interface UserGateway { void updateXgf(UserE userE, Long id); + void deletedUserByPhone(String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java index a53df953..86c0cbb8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.gatewayimpl; import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.Response; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; @@ -221,5 +222,11 @@ public class UserGatewayImpl implements UserGateway { this.update(userE); userRepository.updateXgf(userE); } + + @Override + public void deletedUserByPhone(String phone) { + + userRepository.deletedUserByPhone(phone); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index 121ac73a..32eee1c4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -39,5 +39,7 @@ public interface UserMapper extends BaseMapper { IPage listXgf(IPage iPage, Map params, String menuPerms); List getListByUserIds(List userIds); + + void deletedUserByPhone(String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index 4f199986..4cedef20 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -90,5 +90,7 @@ public interface UserRepository extends BaseRepository { List getByIdCard(String userIdCard, List employmentFlagList); void updateXgf(UserE userE); + + void deletedUserByPhone(String phone); } 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 d44d2d0b..aeb9b1ab 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 @@ -609,5 +609,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } } } + + @Override + public void deletedUserByPhone(String phone) { + userMapper.deletedUserByPhone(phone); + } } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 0b97ff71..19bece7e 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -362,5 +362,8 @@ and u.employment_flag =1 and u.delete_enum = 'FALSE' + + update user set delete_enum = 'TRUE' where phone = #{phone} +