From 458a95b022dc197243d73ab821e67b15d0cff164 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 16 Dec 2025 15:11:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1566555886813192]组合工具查看权限不生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1566555886813192
---
 .../dao/mapper/AutoexecCombopMapper.java      | 13 ++-
 .../dao/mapper/AutoexecCombopMapper.xml       | 88 +++++++++++++++++--
 .../dto/combop/AutoexecCombopSearchVo.java    | 80 +++++++++++++++++
 3 files changed, 170 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/neatlogic/framework/autoexec/dto/combop/AutoexecCombopSearchVo.java

diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
index 993037d7..f961ec0a 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
@@ -14,6 +14,7 @@ package neatlogic.framework.autoexec.dao.mapper;
 
 import neatlogic.framework.autoexec.dto.AutoexecTypeVo;
 import neatlogic.framework.autoexec.dto.combop.AutoexecCombopAuthorityVo;
+import neatlogic.framework.autoexec.dto.combop.AutoexecCombopSearchVo;
 import neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo;
 import neatlogic.framework.common.dto.BasePageVo;
 import neatlogic.framework.dto.AuthenticationInfoVo;
@@ -40,13 +41,17 @@ public interface AutoexecCombopMapper {
 
     List<AutoexecCombopVo> getAutoexecCombopByIdList(List<Long> idList);
 
-    int getAutoexecCombopCount(AutoexecCombopVo searchVo);
+//    int getAutoexecCombopCount(AutoexecCombopVo searchVo);
+//
+//    List<AutoexecCombopVo> getAutoexecCombopList(AutoexecCombopVo searchVo);
 
-    List<AutoexecCombopVo> getAutoexecCombopList(AutoexecCombopVo searchVo);
+//    List<Long> getAutoexecCombopIdList(AutoexecCombopVo searchVo);
 
-    List<Long> getAutoexecCombopIdList(AutoexecCombopVo searchVo);
+//    List<AutoexecCombopVo> getAutoexecCombopListByIdList(List<Long> idList);
 
-    List<AutoexecCombopVo> getAutoexecCombopListByIdList(List<Long> idList);
+    int getAutoexecCombopCount(AutoexecCombopSearchVo searchVo);
+
+    List<Long> getAutoexecCombopIdList(AutoexecCombopSearchVo searchVo);
 
     List<AutoexecCombopAuthorityVo> getAutoexecCombopAuthorityListByCombopId(Long combopId);
 
diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
index d589d85e..b53cbc88 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
@@ -75,7 +75,7 @@
         </foreach>
     </select>
 
-    <select id="getAutoexecCombopCount" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
+    <!--<select id="getAutoexecCombopCount" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
             resultType="int">
         SELECT
         COUNT(`id`)
@@ -97,9 +97,9 @@
                 AND `is_active` = #{isActive}
             </if>
         </where>
-    </select>
+    </select>-->
 
-    <select id="getAutoexecCombopList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
+    <!--<select id="getAutoexecCombopList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
             resultType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo">
         SELECT
         `id`,
@@ -132,9 +132,9 @@
         </where>
         ORDER BY `id` DESC
         LIMIT #{startNum}, #{pageSize}
-    </select>
+    </select>-->
 
-    <select id="getAutoexecCombopIdList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
+    <!--<select id="getAutoexecCombopIdList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
             resultType="java.lang.Long">
         SELECT
         `id`
@@ -152,9 +152,9 @@
         </where>
         ORDER BY `id` DESC
         LIMIT #{startNum}, #{pageSize}
-    </select>
+    </select>-->
 
-    <select id="getAutoexecCombopListByIdList" parameterType="java.lang.Long"
+    <!--<select id="getAutoexecCombopListByIdList" parameterType="java.lang.Long"
             resultType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo">
         SELECT
         `id`,
@@ -171,6 +171,80 @@
         <foreach collection="list" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
+    </select>-->
+
+    <sql id="getAutoexecCombopSearchWhere">
+        <choose>
+            <when test="versionStatus == 'draft'">
+                AND b.status = 'draft'
+            </when>
+            <when test="versionStatus == 'submitted'">
+                AND b.status = 'submitted'
+            </when>
+            <when test="versionStatus == 'rejected'">
+                AND b.status = 'rejected'
+            </when>
+            <otherwise>
+                AND b.status = 'passed' AND b.is_active = 1
+            </otherwise>
+        </choose>
+        <if test="keyword != null and keyword != ''">
+            AND (a.`name` LIKE concat('%', #{keyword}, '%') OR a.`description` LIKE concat('%', #{keyword}, '%'))
+        </if>
+        <if test="typeId != null">
+            AND a.`type_id` = #{typeId}
+        </if>
+        <if test="isActive != null">
+            AND a.`is_active` = #{isActive}
+        </if>
+        <if test="isHasAllAuthority == null or isHasAllAuthority == 0">
+            AND (a.`owner` = #{userUuid}
+            OR (c.`uuid` = 'alluser'
+            <if test="action != null and action != ''">
+                AND c.`action` = #{action}
+            </if>)
+            <choose>
+                <when test="uuidList != null and uuidList.size() > 0">
+                    OR (c.`uuid` IN
+                    <foreach collection="uuidList" item="uuid" open="(" separator="," close=")">
+                        #{uuid}
+                    </foreach>
+                    <if test="action != null and action != ''">
+                        AND c.`action` = #{action}
+                    </if>
+                    )
+                </when>
+                <otherwise>
+                    OR 1 != 1
+                </otherwise>
+            </choose>
+            )
+        </if>
+    </sql>
+
+    <select id="getAutoexecCombopCount" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopSearchVo" resultType="int">
+        SELECT
+        COUNT(DISTINCT a.`id`)
+        FROM `autoexec_combop` a
+        JOIN `autoexec_combop_version` b on b.combop_id = a.id
+        JOIN `autoexec_combop_authority` c on c.combop_id = a.id
+        <where>
+            <include refid="getAutoexecCombopSearchWhere"/>
+        </where>
+    </select>
+
+    <select id="getAutoexecCombopIdList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopSearchVo" resultType="java.lang.Long">
+        SELECT
+        a.`id`
+        FROM `autoexec_combop` a
+        join `autoexec_combop_version` b on b.`combop_id` = a.`id`
+        join `autoexec_combop_authority` c on c.`combop_id` = a.`id`
+        <where>
+            <include refid="getAutoexecCombopSearchWhere"/>
+        </where>
+        GROUP BY a.`id`
+        ORDER BY a.`id` DESC
+        LIMIT #{startNum}, #{pageSize}
     </select>
 
     <select id="getAutoexecCombopAuthorityListByCombopId" parameterType="java.lang.Long"
diff --git a/src/main/java/neatlogic/framework/autoexec/dto/combop/AutoexecCombopSearchVo.java b/src/main/java/neatlogic/framework/autoexec/dto/combop/AutoexecCombopSearchVo.java
new file mode 100644
index 00000000..271d99f0
--- /dev/null
+++ b/src/main/java/neatlogic/framework/autoexec/dto/combop/AutoexecCombopSearchVo.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2025  TechSure Co., Ltd.  All Rights Reserved.
+ * This file is part of the NeatLogic software.
+ * Licensed under the NeatLogic Sustainable Use License (NSUL), Version 4.x – 2025.
+ * You may use this file only in compliance with the License.
+ * See the LICENSE file distributed with this work for the full license text.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ */
+
+package neatlogic.framework.autoexec.dto.combop;
+
+import neatlogic.framework.common.dto.BasePageVo;
+
+import java.util.List;
+
+public class AutoexecCombopSearchVo extends BasePageVo {
+    private String versionStatus;
+    private Long typeId;
+    private Integer IsActive;
+    private List<String> uuidList;
+    private Integer isHasAllAuthority;
+    private String userUuid;
+    private String action;
+    public String getVersionStatus() {
+        return versionStatus;
+    }
+
+    public void setVersionStatus(String status) {
+        this.versionStatus = status;
+    }
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public Integer getIsActive() {
+        return IsActive;
+    }
+
+    public void setIsActive(Integer isActive) {
+        IsActive = isActive;
+    }
+
+    public List<String> getUuidList() {
+        return uuidList;
+    }
+
+    public void setUuidList(List<String> uuidList) {
+        this.uuidList = uuidList;
+    }
+
+    public Integer getIsHasAllAuthority() {
+        return isHasAllAuthority;
+    }
+
+    public void setIsHasAllAuthority(Integer isHasAllAuthority) {
+        this.isHasAllAuthority = isHasAllAuthority;
+    }
+
+    public String getUserUuid() {
+        return userUuid;
+    }
+
+    public void setUserUuid(String userUuid) {
+        this.userUuid = userUuid;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+}
-- 
Gitee


From 172e84279a51b844b82966dcccadc52253cca293 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 16 Dec 2025 15:13:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1566555886813192]组合工具查看权限不生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1566555886813192
---
 .../dao/mapper/AutoexecCombopMapper.java      |  8 --
 .../dao/mapper/AutoexecCombopMapper.xml       | 98 -------------------
 2 files changed, 106 deletions(-)

diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
index f961ec0a..09f34b3d 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.java
@@ -41,14 +41,6 @@ public interface AutoexecCombopMapper {
 
     List<AutoexecCombopVo> getAutoexecCombopByIdList(List<Long> idList);
 
-//    int getAutoexecCombopCount(AutoexecCombopVo searchVo);
-//
-//    List<AutoexecCombopVo> getAutoexecCombopList(AutoexecCombopVo searchVo);
-
-//    List<Long> getAutoexecCombopIdList(AutoexecCombopVo searchVo);
-
-//    List<AutoexecCombopVo> getAutoexecCombopListByIdList(List<Long> idList);
-
     int getAutoexecCombopCount(AutoexecCombopSearchVo searchVo);
 
     List<Long> getAutoexecCombopIdList(AutoexecCombopSearchVo searchVo);
diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
index b53cbc88..10281250 100644
--- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
+++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecCombopMapper.xml
@@ -75,104 +75,6 @@
         </foreach>
     </select>
 
-    <!--<select id="getAutoexecCombopCount" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
-            resultType="int">
-        SELECT
-        COUNT(`id`)
-        FROM `autoexec_combop`
-        <where>
-            <if test="defaultValue != null and defaultValue.size() > 0">
-                AND `id` IN
-                <foreach collection="defaultValue" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="keyword != null and keyword != ''">
-                AND (`name` LIKE concat('%', #{keyword}, '%') OR `description` LIKE concat('%', #{keyword}, '%'))
-            </if>
-            <if test="typeId != null">
-                AND `type_id` = #{typeId}
-            </if>
-            <if test="isActive != null">
-                AND `is_active` = #{isActive}
-            </if>
-        </where>
-    </select>-->
-
-    <!--<select id="getAutoexecCombopList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
-            resultType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo">
-        SELECT
-        `id`,
-        `name`,
-        `description`,
-        `type_id` AS typeId,
-        `is_active` AS isActive,
-        `operation_type` AS operationType,
-        `op_type` as opType,
-        `owner`,
-        `fcd`,
-        `fcu`
-        FROM `autoexec_combop`
-        <where>
-            <if test="defaultValue != null and defaultValue.size() > 0">
-                AND `id` IN
-                <foreach collection="defaultValue" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-            <if test="keyword != null and keyword != ''">
-                AND (`name` LIKE concat('%', #{keyword}, '%') OR `description` LIKE concat('%', #{keyword}, '%'))
-            </if>
-            <if test="typeId != null">
-                AND `type_id` = #{typeId}
-            </if>
-            <if test="isActive != null">
-                AND `is_active` = #{isActive}
-            </if>
-        </where>
-        ORDER BY `id` DESC
-        LIMIT #{startNum}, #{pageSize}
-    </select>-->
-
-    <!--<select id="getAutoexecCombopIdList" parameterType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo"
-            resultType="java.lang.Long">
-        SELECT
-        `id`
-        FROM `autoexec_combop`
-        <where>
-            <if test="keyword != null and keyword != ''">
-                AND `name` LIKE concat('%', #{keyword}, '%')
-            </if>
-            <if test="typeId != null">
-                AND `type_id` = #{typeId}
-            </if>
-            <if test="isActive != null">
-                AND `is_active` = #{isActive}
-            </if>
-        </where>
-        ORDER BY `id` DESC
-        LIMIT #{startNum}, #{pageSize}
-    </select>-->
-
-    <!--<select id="getAutoexecCombopListByIdList" parameterType="java.lang.Long"
-            resultType="neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo">
-        SELECT
-        `id`,
-        `name`,
-        `description`,
-        `type_id` AS typeId,
-        `is_active` AS isActive,
-        `operation_type` AS operationType,
-        `owner`,
-        `fcd`,
-        `fcu`
-        FROM `autoexec_combop`
-        WHERE `id` IN
-        <foreach collection="list" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>-->
-
     <sql id="getAutoexecCombopSearchWhere">
         <choose>
             <when test="versionStatus == 'draft'">
-- 
Gitee