From 13d1b507ffee5f557a9387f0a73f92c85022c454 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 4 Nov 2026 13:54:09 +0800
Subject: [PATCH] =?UTF-8?q?2026-11-03=20=E7=8E=B0=E5=9C=BA=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A7=E6=A8=A1=E5=9E=8B=E4=BA=BA=E5=91=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java  |  8 ++++----
 .../sys/SysSceneDynamicControlModelMapper.xml       | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index b278318..1d8ac9d 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -116,12 +116,12 @@ public class ScheduleServiceImpl implements ScheduleService {
     private RestTemplate restTemplate;
 
     // 测试环境接口
-//    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
-//    private String mesLogsBaseUrl;
-
-    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
+    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
     private String mesLogsBaseUrl;
 
+//    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
+//    private String mesLogsBaseUrl;
+
     @Value("${mes.logs.username:BOINGTECH}")
     private String mesLogsUsername;
 
diff --git a/src/main/resources/mapper/sys/SysSceneDynamicControlModelMapper.xml b/src/main/resources/mapper/sys/SysSceneDynamicControlModelMapper.xml
index 327d8f9..4fc4b39 100644
--- a/src/main/resources/mapper/sys/SysSceneDynamicControlModelMapper.xml
+++ b/src/main/resources/mapper/sys/SysSceneDynamicControlModelMapper.xml
@@ -250,18 +250,19 @@
 	</select>
 
 	<sql id="personValueWhere">
-		WHERE site = #{site}
-		  AND (#{keyword} = '' OR operator_id LIKE '%' + #{keyword} + '%' OR operator_name LIKE '%' + #{keyword} + '%')
+		WHERE (site = #{site} OR EXISTS (SELECT 1 FROM AccessSite s WHERE s.userID = sys_user.username AND s.site = #{site}))
+		  AND (status IS NULL OR status = 1)
+		  AND (#{keyword} = '' OR username LIKE '%' + #{keyword} + '%' OR user_display LIKE '%' + #{keyword} + '%')
 	</sql>
 	<select id="countPersonValue" resultType="int">
-		SELECT COUNT(1) FROM operator
+		SELECT COUNT(1) FROM sys_user
 		<include refid="personValueWhere"/>
 	</select>
 	<select id="searchPersonValue" resultType="com.gaotao.modules.sys.entity.SysSceneDynamicControlScopeEntity">
-		SELECT operator_id AS valueCode, operator_name AS valueName
-		FROM operator
+		SELECT username AS valueCode, ISNULL(user_display, username) AS valueName
+		FROM sys_user
 		<include refid="personValueWhere"/>
-		ORDER BY operator_id
+		ORDER BY username
 		OFFSET #{offset} ROWS FETCH NEXT #{limit} ROWS ONLY
 	</select>
 </mapper>