From de123f4416ae566471701d5d7a3a8b5ca746cfa3 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 16 Jun 2020 11:28:59 +0800
Subject: [PATCH] 新增接口:删除用户,获取用户登录后信息

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 20b31d6..23d5af5 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -380,10 +380,24 @@
         return result ? ResultBody.ok().data(sysUser).msg("操作成功") : ResultBody.failed("操作失败");
     }
 
+    /**
+     * 删除用户
+     *
+     * @param id
+     * @return
+     */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean delUser(Long id) {
+        //删除角色数据
         roleUserService.deleteUserRole(id, null);
+        //删除组织对应数据
+        organizationService.deleteByUserId(id);
+        //删除医生数据
+        Map<String, Object> params = new HashMap<>();
+        params.put("userId", id);
+        sysDoctorMapper.deleteByMap(params);
+        //删除用户数据
         return baseMapper.deleteById(id) > 0;
     }
 
@@ -746,7 +760,14 @@
             sysDoctor.setServerUserId(0L);
             sysDoctor.setServerUserName("自主注册");
             if (sysDoctorMapper.insert(sysDoctor) == 1) {
-                sysUser.setPassword(userRegVo.getPassword());
+                if (StringUtils.isNotBlank(defaultPassWord)) {
+                    //默认密码需要返回
+                    sysUser.setPassword(defaultPassWord);
+                }
+                else
+                {
+                    sysUser.setPassword("");
+                }
                 return ResultBody.ok(200, "注册成功").data(sysUser);
             } else {
                 return ResultBody.failed("医生数据写入失败");

--
Gitblit v1.8.0