From 81a82c8a3f32f80c4c51bdbbc2914615444685d9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 10:04:52 +0800
Subject: [PATCH] ci:持续修改
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 6b9e2aa..d72e2ec 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
@@ -115,11 +115,11 @@
wrapper.eq("is_del",Constants.NOT_DELETE);
wrapper.eq("state",0);
wrapper.eq("is_invalid",0);
+
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object code = userInfo.get("code");
- if (!ObjectUtils.isEmpty(code)){
- wrapper.eq("area_code",code);
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
}
List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
return responsibilityUnits;
@@ -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,12 @@
List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
wrapper.in("unit_id",collect1);
}
+ }else if(orgId==24) {
+
+ }else {
+ if (ObjectUtils.isEmpty(unitId)){
+ return null;
+ }
}
}
--
Gitblit v1.8.0