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 @@
- 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} + '%')