From c115237aeb36c61bb61b617d54ba4d7025381527 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 四月 2024 11:11:57 +0800
Subject: [PATCH] 系统调整

---
 data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index 07c2a5a..ffe8732 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -23,6 +23,7 @@
 import com.yuanchu.mom.dto.DataReportingPageDto;
 import com.yuanchu.mom.dto.ProductCountDto;
 import com.yuanchu.mom.dto.RegistrantCountDto;
+import com.yuanchu.mom.mapper.AuthMapper;
 import com.yuanchu.mom.mapper.FansSubmitMapper;
 import com.yuanchu.mom.mapper.FinanceSubmitMapper;
 import com.yuanchu.mom.pojo.DataReporting;
@@ -84,11 +85,18 @@
     @Resource
     private FinanceSubmitMapper financeSubmitMapper;
 
+    @Resource
+    private AuthMapper authMapper;
+
     @Override
     public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
         if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
+        Integer power = authMapper.isPower(map1.get("userId"), "dataReportingPower");
+        if(power == 1){
+           dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
+        }
         map.put("head", PrintChina.printChina(DataReportingPageDto.class));
         map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto)));
         return map;
@@ -152,7 +160,10 @@
         Map<String, Object> map = new HashMap<>();
         map.put("head", PrintChina.printChina(RegistrantCountDto.class));
         Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList");
-        if (map1.get("look") == 1) registrantCountDto.setCreateUser(map1.get("userId"));
+        if (map1.get("look") == 1) {
+            String name = dataReportingMapper.getUserNameById(map1.get("userId"));
+            registrantCountDto.setName2(name);
+        };
         map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
         return map;
     }

--
Gitblit v1.9.3