From 56b56981b1e770fa3bb988f60c8208f84769b687 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 28 Aug 2025 11:29:30 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E4=BE=BF=E5=88=A9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?id=E6=97=B6=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E9=99=90=E5=AE=9A=E6=9F=A5=E8=AF=A2=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/common/task/GenerateTask.java      | 1 -
 .../ai/da/service/impl/ConvenientInquiryServiceImpl.java   | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/common/task/GenerateTask.java b/src/main/java/com/ai/da/common/task/GenerateTask.java
index 19692077..e47b8614 100644
--- a/src/main/java/com/ai/da/common/task/GenerateTask.java
+++ b/src/main/java/com/ai/da/common/task/GenerateTask.java
@@ -105,7 +105,6 @@ public class GenerateTask {
     // 万相 -> pose transformation 补偿 一小时执行一次
     @Scheduled(fixedDelay = 5 * 60 * 1000)
     public void wxCompensationMechanism(){
-        log.info("万相补偿机制开始执行");
         List<APIGenerate> apiGenerates = apiGenerateService.getPendingTaskByStatus("wx");
         if (apiGenerates != null && !apiGenerates.isEmpty()){
             for (APIGenerate apiGenerate : apiGenerates){
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index a416d8ff..842fb1bd 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -660,8 +660,15 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
     }
 
     public List<Map<String, Object>> getAllUserIdList() {
+        Long accountId = UserContext.getUserHolder().getId();
+        Account account = accountMapper.selectById(accountId);
+
         QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id as value, user_name as label");
+        if ((account.getSystemUser().equals(7) || account.getSystemUser().equals(5))
+                && !StringUtil.isNullOrEmpty(account.getOrganizationName())) {
+            queryWrapper.lambda().eq(Account::getOrganizationName, account.getOrganizationName());
+        }
 
         return accountMapper.selectMaps(queryWrapper);
 //        return maps.stream().map(map -> (Long)map.get("id")).collect(Collectors.toList());