From 3aa5acc2aff683ead0e2ca585a604f547b68dbf6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 11 Oct 2023 15:35:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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 d58c404..5949515 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
@@ -211,32 +211,46 @@
public Map<String, Object> selectUnitView(Map<String, Object> map) {
QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object unitId = userInfo.get("unitId");
- Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
- Integer orgId = (Integer) orgInfo.get("id");
+ List<Integer> list = this.unitResult();
if (!ObjectUtils.isEmpty(map.get("unitId"))){
wrapper.in("unit_id",map.get("unitId").toString());
}else {
- if (orgId!=24){
- if (ObjectUtils.isEmpty(unitId)){
+ if (!ObjectUtils.isEmpty(list)){
+ Integer integer = list.get(0);
+ if (integer==0){
return null;
- }
- ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
- Integer areaCode = responsibilityUnit1.getAreaCode();
- List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
- if (ObjectUtils.isEmpty(responsibilityUnits)){
- List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
- Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
- List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
- wrapper.in("unit_id",collect1);
}else {
- Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
- List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
- wrapper.in("unit_id",collect1);
+ wrapper.in("unit_id",list);
}
}
}
+
+// Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+// Object unitId = userInfo.get("unitId");
+// Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+// Integer orgId = (Integer) orgInfo.get("id");
+// if (!ObjectUtils.isEmpty(map.get("unitId"))){
+// wrapper.in("unit_id",map.get("unitId").toString());
+// }else {
+// if (orgId!=24){
+// if (ObjectUtils.isEmpty(unitId)){
+// return null;
+// }
+// ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+// Integer areaCode = responsibilityUnit1.getAreaCode();
+// List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
+// if (ObjectUtils.isEmpty(responsibilityUnits)){
+// List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+// Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+// List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+// wrapper.in("unit_id",collect1);
+// }else {
+// Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+// List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+// wrapper.in("unit_id",collect1);
+// }
+// }
+// }
HashMap<String, Object> rsMap = new HashMap<>();
ArrayList<Map<String, Object>> polluteArrayList = new ArrayList<>();
@@ -602,6 +616,7 @@
}
AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
+ allocationExtension.setExtensionOldNum(allocationExt.getChangeDay());
allocationExtensionService.save(allocationExtension);
fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
return true;
@@ -611,7 +626,7 @@
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
- List<Integer> userList = responsibilityUnitMapper.selectCodeList("JBD",user.getUserId());
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
return new ArrayList<>();
}
@@ -625,7 +640,7 @@
@Override
public Integer unitAreaCode() {
QxUser user = UserHelper.getCurrentUser();
- List<Integer> userList = responsibilityUnitMapper.selectCodeList("JBD",user.getUserId());
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
return 1;
}
--
Gitblit v1.8.0