From 03503909d78ca5d4e725520953e29de9e691e13a Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Mon, 25 Mar 2024 11:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E7=AE=A1=E7=90=86=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/biutag/enums/DeptTypeEnum.java       | 4 ++--
 .../java/com/biutag/lan/service/impl/DeptServiceImpl.java  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java b/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java
index b59bd88..6ba9575 100644
--- a/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java
+++ b/mailbox-common/src/main/java/com/biutag/enums/DeptTypeEnum.java
@@ -22,9 +22,9 @@ public enum DeptTypeEnum {
     // 三级机构领导
     PCS_TYPE("5", "派出所"),
     // 二级机构领导
-    DD_TYPE("6", "大队");
+    DD_TYPE("6", "大队"),
     // 三级机构领导
-
+    OT_TYPE("7", "其他");
 
     private String type;
 
diff --git a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java
index 27ee0f5..6f95d8f 100644
--- a/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java
+++ b/mailbox-lan/src/main/java/com/biutag/lan/service/impl/DeptServiceImpl.java
@@ -369,10 +369,9 @@ class DeptServiceImpl implements IDeptService {
         List<Duty> dutySjList = null;
         List<Duty> dutyPcsList = null;
         List<Duty> dutyDdList = null;
-
+        List<Duty> dutyOtList = null;
         if (dept.getLevel()==2){
             Duty duty = dutyMapper.selectOne(new QueryWrapper<Duty>().eq("depart_id",deptId).last("limit 1"));
-            System.out.println("ddddddddddddddddd"+duty);
             if(duty==null){
             } else if (duty.getDeptType().equals(DeptTypeEnum.FJ_TYPE.getType())){
                 dutyFjList = dataScreenMapper.getToFjDuty(DeptTypeEnum.FJ_TYPE.getType(), deptId);
@@ -385,9 +384,11 @@ class DeptServiceImpl implements IDeptService {
             dutySjList = dataScreenMapper.getToDayDuty(DeptTypeEnum.SJ_TYPE.getType(), null);
              dutyPcsList = dataScreenMapper.getToDayDuty(DeptTypeEnum.PCS_TYPE.getType(), deptId);
              dutyDdList = dataScreenMapper.getToDayDuty(DeptTypeEnum.DD_TYPE.getType(), deptId);
+            dutyOtList = dataScreenMapper.getToDayDuty(DeptTypeEnum.OT_TYPE.getType(), deptId);
             map.put("dutySjList", dutySjList);
             map.put("dutyPcsList", dutyPcsList);
             map.put("dutyDdList", dutyDdList);
+            map.put("dutyOtList", dutyOtList);
 
         }else if (dept.getLevel()==3){
             Duty duty = dutyMapper.selectOne(new QueryWrapper<Duty>().eq("depart_id",dept.getPid()).last("limit 1"));
@@ -409,6 +410,8 @@ class DeptServiceImpl implements IDeptService {
                 dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.PCS_TYPE.getType(), deptId);
             }else if (dutyByDeptid.getDeptType().equals(DeptTypeEnum.DD_TYPE.getType())){
                 dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.DD_TYPE.getType(), deptId);
+            }else if (duty.getDeptType().equals(DeptTypeEnum.OT_TYPE.getType())){
+                dutyPcsList = dataScreenMapper.getToFjDuty(DeptTypeEnum.OT_TYPE.getType(), deptId);
             }
             map.put("dutyPcsList", dutyPcsList);
         }