From b5b6b59de8f5349de1e36875582224f2712e0727 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 10:13:27 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java |   66 ++++++++------------------------
 1 files changed, 17 insertions(+), 49 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 6a5a6d9..6a2648b 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
@@ -222,32 +222,7 @@
             }
         }
 
-//        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<>();
@@ -405,29 +380,7 @@
                 }
             }
         }
-//        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(unitId)){
-//            return null;
-//        }
-//        if (orgId!=24){
-//            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);
-//            }
-//        }
+
 
         ArrayList<Map<String, Object>> rsMap = new ArrayList<>();
         Object number1 = map.get("number");
@@ -496,6 +449,7 @@
 
     @Override
     public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
+        List<Integer> unitAuthority = this.getUnitAuthority(SysDictTypeEnum.SYS_AMEND.value);
         List<Integer> unitList = unitResult();
         Integer codeId =  unitAreaCode();
         allocationPageCond.setUnitList(unitList);
@@ -507,6 +461,7 @@
                 }else {
                     it.setIsApprove(0);
                 }
+                it.setIsCode(ObjectUtils.isEmpty(unitAuthority)?"2":"1");
             });
         }
         return page;
@@ -979,6 +934,19 @@
         return allocationLogs;
     }
 
+    /**
+     * ������������������������������
+     *
+     * @param code
+     * @return
+     */
+    @Override
+    public List<Integer> getUnitAuthority(String code) {
+        QxUser user = UserHelper.getCurrentUser();
+        List<Integer> userList = responsibilityUnitMapper.selectCodeList(code,user.getUserId());
+        return userList;
+    }
+
     @Override
     public List<Integer>  unitResult() {
         QxUser user = UserHelper.getCurrentUser();

--
Gitblit v1.8.0