From 0d7f4bb2350231f2a41e69d581205962ff62e6a7 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 1 Aug 2022 16:59:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=88=86=E4=BA=AB=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/ext/ExtPanelShareMapper.xml   | 20 ++++++++++++-------
 .../dataease/service/panel/ShareService.java  |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
index 6d777ac368..1399a0a9d2 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelShareMapper.xml
@@ -41,13 +41,19 @@
         left join panel_group g on g.id = s.panel_group_id
         left join sys_user u on u.username = IFNULL(s.granter,g.create_by)
         where
-        ( s.target_id = #{userId} and s.type = 0 ) or
-        ( s.target_id = #{deptId} and s.type = 2 ) or
-        ( s.target_id in
-        <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
-            #{roleId}
-        </foreach>
-        and s.type = 1 )
+        ( s.target_id = #{userId} and s.type = 0 )
+        <if test="deptId != null">
+            or ( s.target_id = #{deptId} and s.type = 2 )
+        </if>
+        <if test="roleIds != null">
+            or
+            ( s.target_id in
+            <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+                #{roleId}
+            </foreach>
+            and s.type = 1 )
+        </if>
+
         <if test="orderByClause == null">
             order by s.create_time desc
         </if>
diff --git a/backend/src/main/java/io/dataease/service/panel/ShareService.java b/backend/src/main/java/io/dataease/service/panel/ShareService.java
index 66935e481a..044832818f 100644
--- a/backend/src/main/java/io/dataease/service/panel/ShareService.java
+++ b/backend/src/main/java/io/dataease/service/panel/ShareService.java
@@ -349,7 +349,7 @@ public class ShareService {
         Map<String, Object> param = new HashMap<>();
         param.put("userId", userId);
         param.put("deptId", deptId);
-        param.put("roleIds", roleIds);
+        param.put("roleIds", CollectionUtils.isNotEmpty(roleIds)? roleIds: null);
 
         List<PanelSharePo> datas = extPanelShareMapper.query(param);
         List<PanelShareDto> dtoLists = datas.stream().map(po -> BeanUtils.copyBean(new PanelShareDto(), po))