From bb04b10f98927d46381e5b3060a83cf4050f7fe7 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Wed, 28 Feb 2024 19:01:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E7=94=A8=E6=88=B7=E6=97=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E6=97=A0=E4=BB=BB=E4=B8=80=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=EF=BC=8C=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1044133269962752]代码中心-用户无自动发布管理权限，且无任一应用的编辑权限，回显应用列表为空 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1044133269962752
---
 .../dao/mapper/DeployAppConfigMapper.xml      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
index ab2d66ef..9f6f8f6e 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
@@ -47,9 +47,10 @@ limitations under the License.
                 </foreach>
             </if>
             <if test="searchVo.isHasAllAuthority == 0">
-                AND IF(
-                daca.app_system_id > 0,
-                daca.action_type = 'operation'
+                AND
+                (daca.app_system_id is null
+                OR
+                (daca.action_type = 'operation'
                 AND daca.action IN
                 ('all'
                 <if test="searchVo.authorityActionList != null and searchVo.authorityActionList.size() > 0">,
@@ -67,8 +68,9 @@ limitations under the License.
                         #{item}
                     </foreach>
                 </if>
-                ),
-                1 = 1)
+                )
+                )
+                )
             </if>
             <choose>
                 <when test="searchVo.isConfig != null and searchVo.isConfig == 1">
@@ -944,7 +946,10 @@ limitations under the License.
 
     <sql id="checkDeployAuthority">
         <if test="isHasAllAuthority == 0">
-            AND daca.action_type = 'operation'
+            AND
+            (daca.app_system_id is null
+            OR
+            (daca.action_type = 'operation'
             AND daca.action IN
             ('all'
             <if test="authorityActionList != null and authorityActionList.size() > 0">,
@@ -963,6 +968,8 @@ limitations under the License.
                 </foreach>
             </if>
             )
+            )
+            )
         </if>
     </sql>
 
-- 
Gitee