From dc6a8ff2eb1dbfc532eac8d296b68e5e05a4a6e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 六月 2024 13:59:27 +0800
Subject: [PATCH] 工时组长权限bug修改
---
performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java | 1 +
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java | 1 +
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 4 ++--
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java
index df80c5c..4586c0c 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateGroupController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java
index bd084dd..5b8abde 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateLeaderController.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
index 52783f9..d91c8f0 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
@@ -56,7 +56,7 @@
@Override
public Map<String, Object> selectAuxiliaryCorrectionHours(Page page, AuxiliaryCorrectionHoursDto auxiliaryCorrectionHoursDto) {
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
map.put("head", PrintChina.printChina(AuxiliaryCorrectionHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryCorrectionHours");
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index 22b2f41..89d187b 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -57,7 +57,7 @@
@Override
public Map<String, Object> selectAuxiliaryOriginalHours(Page page, AuxiliaryOriginalHoursLookDto auxiliaryOriginalHoursLookDto) {
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>(); ;
map.put("head", PrintChina.printChina(AuxiliaryCorrectionHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOriginalHours");
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index 10d0ee5..fdd03cf 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -67,7 +67,7 @@
auxiliaryOutputWorkingHoursDto.setDateTime(null);
auxiliaryOutputWorkingHoursDto.setWeek(null);
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
map.put("head", PrintChina.printChina(AuxiliaryOutputWorkingHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
@@ -169,7 +169,7 @@
public void exportWorkingHours(HttpServletResponse response) throws IOException {
List<AuxiliaryOutputWorkingHoursDto> auxiliaryOutputWorkingHoursDtos = new ArrayList<>();
List<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtos = new ArrayList<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
//鍒ゆ柇鏄粍闀胯繕鏄粍鍛樿繕鏄鐞嗗憳
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
User user = userMapper.selectById(map1.get("userId"));
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index f26288f..d94d359 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -63,7 +63,7 @@
auxiliaryWorkingHoursDayDto.setDateTime(null);
auxiliaryWorkingHoursDayDto.setWeek(null);
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
--
Gitblit v1.9.3