From fc55a9089a54f6e0682be076a1857fd1ddf5ec0e Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:05 +0800
Subject: [PATCH] 增加医院ID、科室ID和医生ID,由调用方传入,避免非前端请求时产生的错误。

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |    5 ++++-
 1 files changed, 4 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 30e588c..9724248 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
@@ -113,6 +113,7 @@
     @Override
     public LoginAppUser getLoginAppUser(SysUser sysUser) {
         LoginAppUser loginAppUser = new LoginAppUser();
+        SysUser sysUserNew = this.baseMapper.selectById(sysUser);
         if (sysUser != null) {
             //返回的数据为什么要把密码也返回?清空!!
             loginAppUser.setPassword("");
@@ -121,6 +122,7 @@
 
             BeanUtils.copyProperties(sysUser, loginAppUser);
             //获取用户所属组织机构列表
+            loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
             List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
             //设置组织机构集合
             loginAppUser.setOrganizations(sysOrganizations);
@@ -938,6 +940,7 @@
     public boolean phoneIsUsed(String phone) {
         Map<String, Object> selectMap = new HashMap<>();
         selectMap.put("mobile", phone);
+        selectMap.put("is_del", 0);
         List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
         return (sysUsers.size() > 0);
     }
@@ -948,7 +951,7 @@
      * @param depatmentId
      * @return
      */
-    private Integer departmetAccountsCount(Long depatmentId) {
+    public Integer departmetAccountsCount(Long depatmentId) {
         SysDepartment sysDepartment = departmentService.getById(depatmentId);
         if (sysDepartment == null) {
             return 0;

--
Gitblit v1.8.0