Merge remote-tracking branch 'origin/master'

gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java

@@ -38,7 +38,10 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
         List<SysDept> sysDepts = deptService.selectAllDeptList();
+//        部门领导
         List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
+//        局党委和分管局成员
+        List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList());
         startPage();
         SysUser user = getLoginUser().getUser();
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -69,7 +72,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
             List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
             long count = nonWorkingDayDrinkingReportService.count(queryWrapper);
             return getDataTableEnhance(list, count);
-        }else if ("分管局领导".equals(user.getNickName())){
+        }else if (leaderLeader.contains(user.getNickName())){
 //            分管局领导
             queryWrapper.eq("user_type",1);
             List<NonWorkingDayDrinkingReport> list = nonWorkingDayDrinkingReportService.list(queryWrapper);
@@ -96,7 +99,10 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
     @PostMapping("/add")
     public AjaxResult add(@RequestBody NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) {
         List<SysDept> sysDepts = deptService.selectAllDeptList();
+//        部门领导
         List<String> leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList());
+//        局党委和分管局成员
+        List<String> leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList());
         SysUser user = getLoginUser().getUser();
         if (nonWorkingDayDrinkingReport.getId() == null) {
             nonWorkingDayDrinkingReport.setCreateBy(user.getNickName());
@@ -108,7 +114,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
             if (leader.contains(user.getNickName())) {
 //                单位领导
                 nonWorkingDayDrinkingReport.setUserType(1);
-            } else if ("前、现局党委成员".equals(user.getNickName())) {
+            } else if (leaderLeader.contains(user.getNickName())) {
                 nonWorkingDayDrinkingReport.setUserType(2);
             } else {
 //                普通民警

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -1,14 +1,15 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.util.ArrayList;
+import com.ruoyi.common.core.domain.BaseEntity;
-import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.util.ArrayList;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.List;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
@@ -37,6 +38,9 @@ public class SysDept extends BaseEntity
     /** 负责人 */
     private String leader;
 
+    /** 负责人 */
+    private String leaderLeader;
+
     /** 联系电话 */
     private String phone;
 
@@ -55,6 +59,14 @@ public class SysDept extends BaseEntity
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
+    public String getLeaderLeader() {
+        return leaderLeader;
+    }
+
+    public void setLeaderLeader(String leaderLeader) {
+        this.leaderLeader = leaderLeader;
+    }
+
     public Long getDeptId()
     {
         return deptId;