From 147a649dbb6e473e0a0f9d3a6aa854a7add4d990 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 30 Jun 2020 17:12:28 +0800
Subject: [PATCH] 修改使用默认密码登陆,跳转到修改密码的接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |    2 ++
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java                               |    2 +-
 2 files changed, 3 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..dd955aa 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);
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
index befafb5..8380373 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUser.java
@@ -33,7 +33,7 @@
     @TableLogic
     private boolean isDel;
     //是否默认密码
-    private boolean defaultAuth;
+    private Boolean defaultAuth;
     //是否医院管理
     @TableField(exist = false)
     private boolean isHAdminUser;

--
Gitblit v1.8.0