From fc5962336a13a5f53f9b499a498b71d80974cbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 3 Nov 2020 09:37:04 +0800
Subject: [PATCH] fix

---
 .../performance/service/AssessService.java    |  7 ++++--
 .../service/impl/AssessServiceImpl.java       | 23 ++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/service/AssessService.java b/src/main/java/com/lz/modules/performance/service/AssessService.java
index 1ab76990..cfb46616 100644
--- a/src/main/java/com/lz/modules/performance/service/AssessService.java
+++ b/src/main/java/com/lz/modules/performance/service/AssessService.java
@@ -15,8 +15,11 @@ import java.util.List;
 public interface AssessService {
     PageUtils userTaskList(AssessTaskReq req,Long userId);
 
+    /**
+     *
+     * @param staffRole
+     * @return null 为全部部门   size = 0 为没有部门
+     */
     List<Long> roleDepartment(StaffRole staffRole);
 
-    List<Long> roleEvgroup(StaffRole staffRole);
-
 }
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
index 6bfb8a61..d0e756b6 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
@@ -1,5 +1,6 @@
 package com.lz.modules.performance.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.lz.common.utils.DateUtils;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.StringUtil;
@@ -16,6 +17,7 @@ import com.lz.modules.performance.req.AssessTaskReq;
 import com.lz.modules.performance.res.ChartStatisticalRes;
 import com.lz.modules.performance.res.TaskListRes;
 import com.lz.modules.performance.service.AssessService;
+import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,7 @@ import java.util.stream.Collectors;
  * @Desc:
  * @Date: 2020/10/14 14:59
  */
+@Slf4j
 @Service("assessService")
 public class AssessServiceImpl implements AssessService {
     @Autowired
@@ -82,6 +85,12 @@ public class AssessServiceImpl implements AssessService {
 
     @Override
     public List<Long> roleDepartment(StaffRole staffRole) {
+        if(staffRole == null){
+            log.info("staffRole 为空");
+            return Collections.EMPTY_LIST;
+        }
+        log.info("获取 roleDepartment,staffRole: " + JSON.toJSONString(staffRole));
+        // 0 标识全部部门
         if (staffRole.getDepartmentId() == 0) {
             return null;
         }
@@ -97,21 +106,9 @@ public class AssessServiceImpl implements AssessService {
                 List<Long> collect = allDepart.stream().distinct().map(s -> Long.valueOf(s)).collect(Collectors.toList());
                 return collect;
             }
+            log.info("未获取到用户权限对应的部门 roleID: " + staffRole.getId());
             return Collections.EMPTY_LIST;
         }
 
     }
-
-
-    @Override
-    public List<Long> roleEvgroup(StaffRole staffRole) {
-        if (staffRole.getDepartmentId() == 0) {
-            return null;
-        }
-        else {
-            return staffRoleEvaluationGroupService.selectEvaluationGroupIdsByRoleId(staffRole.getId());
-        }
-    }
-
-
 }