From 4ec661010eee190dfb95c2646ac0e28e8d9a7bd5 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 19 Jan 2022 18:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=97=E6=96=B9=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2=E7=99=BB=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2=E7=9B=B4=E6=8E=A5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E3=80=81=E4=B8=8B=E8=BD=BD=E3=80=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/README.md       |  4 ++-
 .../resources/mapper/Power_UserMapper.xml     | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/power-admin/src/main/resources/config/README.md b/power-admin/src/main/resources/config/README.md
index 05d710f..20ba9ac 100644
--- a/power-admin/src/main/resources/config/README.md
+++ b/power-admin/src/main/resources/config/README.md
@@ -2,4 +2,6 @@
 #2.0.2 2022-01-10
 集成对接广州南方医院第三方认证接口
 #2.0.3 2022-01-14
-升级mybatis安全漏洞3.4.6->3.5.7
\ No newline at end of file
+升级mybatis安全漏洞3.4.6->3.5.7
+#2.0.4 2022-01-19
+修改南方医院登录查询没有查询角色直接查看、下载、查看打印权限
\ No newline at end of file
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 625fab4..49e61e7 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -265,11 +265,33 @@
   <!--2019-07-31 zengwenhe -->
   <select id="checkUserName"  resultMap="BaseResultMap"  parameterType="java.lang.String">
     SELECT
-        *
+        user_id,
+        power_role.show_record,
+        power_role.downLoad_record,
+        power_role.show_print,
+        user_name,
+        NAME,
+        user_sex,
+        user_age,
+        user_tel,
+        power_user.role_id,
+        power_user.dept_id,
+        power_user.effective,
+        power_user.create_date,
+        power_user.creater,
+        power_user.update_date,
+        power_user.updater,
+        power_user.remark,
+        GROUP_CONCAT(power_dept.dept_name) powerDepts
     FROM
         power_user
-    WHERE
-        user_name = #{userName}
+    LEFT JOIN power_role ON power_user.role_id = power_role.role_id
+    LEFT JOIN power_dept ON FIND_IN_SET(
+        power_dept.dept_id,
+        power_user.dept_id
+    )
+    where power_user.effective = 1 and user_name = #{userName,jdbcType=VARCHAR}
+    GROUP BY user_id
   </select>
 
   <!--2019-4-22 ljx -->