From b38d3bad1b258567a9aea9cc89b36e407b0f7b87 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 25 Dec 2025 20:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=9A=84=E6=A6=82=E5=BF=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapping/CsConfigurationMapper.xml        | 13 ++++++++-----
 .../service/impl/CsConfigurationServiceImpl.java    |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
index 4b8b93e..6af6965 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml
@@ -25,11 +25,14 @@
     <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
       #{item}
     </foreach>
-    AND (a.scope = 1
-    <if test="userId != null and userId != ''">
-      OR (a.scope = 0 AND a.create_by = #{userId})
-    </if>
-    )
+    <choose>
+      <when test="userId != null and userId != ''">
+        AND (a.scope = 1 OR (a.scope = 0 AND a.create_by = #{userId}))
+      </when>
+      <otherwise>
+        AND (a.scope = 1 OR a.scope = 0)
+      </otherwise>
+    </choose>
     <if test="temp!=null and temp.searchValue != null and temp.searchValue !=''">
       AND a.name  like concat(concat("%",#{temp.searchValue}),"%")
     </if>
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
index b72b0b8..bb3355a 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
@@ -125,7 +125,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
         data1.add(DataParam.WIRELESS_PROJECT_ID);
         String userId = csConfigurationQueryParam.getCurrentUserId();
         String roleCode = csConfigurationQueryParam.getRoleCode();
-        if (roleCode.indexOf("operation_manager") > 0) {
+        if (roleCode.contains("operation_manager")) {
             userId = null;
         }
         Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().queryPage(temppage, csConfigurationQueryParam, data1, userId);