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 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> getAllUserIdList() { + Long accountId = UserContext.getUserHolder().getId(); + Account account = accountMapper.selectById(accountId); + QueryWrapper 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());