From a5212f4d8c9a1565a05c96ec27bc13b56f66f817 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 19:32:13 +0800
Subject: [PATCH] ci:持续修改
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 2d6afe9..425e105 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -305,11 +305,6 @@
Object unitId = userInfo.get("unitId");
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
-// Integer unitId= 17;
- if (ObjectUtils.isEmpty(unitId)){
- return null;
- }
-
if (!ObjectUtils.isEmpty(map.get("unitId"))){
wrapper.in("unit_id",map.get("unitId").toString());
}else {
@@ -327,6 +322,10 @@
List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
wrapper.in("unit_id",collect1);
}
+ }else {
+ if (ObjectUtils.isEmpty(unitId)){
+ return null;
+ }
}
}
--
Gitblit v1.8.0