From ad9b449f993c0a01f5e40a892f8e3f7ffb533d96 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 10 Sep 2020 10:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=80=99tgit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    |  1 -
 .../service/impl/RecordAuthServiceImpl.java   | 27 +++++++++++++++++++
 .../app/impl/ResultRecordServiceImpl.java     |  9 +++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 26c69009..62186b68 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -264,7 +264,6 @@ public class ResultRecordController extends AbstractController {
                 list.add(comment);
             }
         }
-
         String superStaff = recordAuthService.selectByStaffId(resultRecord.getStaffId());
         int fileCount = recordFileService.selectRecordFileCountByRecordId(resultRecord.getId());
         return R.ok()
diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java
index d88173e6..bc5d97ba 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.common.utils.NumberUtil;
 import com.lz.common.utils.StringUtil;
+import com.lz.modules.app.dao.DepartmentsDao;
 import com.lz.modules.app.entity.DepartmentsEntity;
 import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
 import com.lz.modules.app.entity.StaffEntity;
@@ -49,6 +50,9 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
     @Autowired
 	private DepartmentsService departmentsService;
 
+    @Autowired
+	private DepartmentsDao departmentsDao;
+
 	@Override
 	public RecordAuth selectRecordAuthById(Long id){
 		return recordAuthMapper.selectRecordAuthById(id);
@@ -147,10 +151,33 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
 			if (leader != null) {
 				StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
 				return staffEntity.getName();
+			} else {
+				Map<String, String> map = departmentsService.selectUserAllDepartmentInFo(departmentsStaffRelateEntity.getDepartmentId());
+				if (StringUtil.isNotBlank(map.get("dd2"))) {
+					StaffEntity staffEntity = getLeader(map.get("dd2"));
+					if (staffEntity != null) {
+						return staffEntity.getName();
+					}
+				}
+				if (StringUtil.isNotBlank(map.get("dd3"))) {
+					StaffEntity staffEntity = getLeader(map.get("dd3"));
+					if (staffEntity != null) {
+						return staffEntity.getName();
+					}
+				}
 			}
 			return "";
 		}
 	}
 
+	public StaffEntity getLeader(String departmentId){
+		DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentId);
+		if(leader !=null && leader.getIsLeader().equals(1)){
+			StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
+			return staffEntity;
+		}
+		return null;
+	}
+
 
 }
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 13c35ab3..4e87f416 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -271,6 +271,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         if (flowDepartment == null) {
             DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(staffId);
             DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
+            if(leader == null){
+                Map<String, String> map = departmentsService.selectUserAllDepartmentInFo(departmentsStaffRelateEntity.getDepartmentId());
+                if (StringUtil.isNotBlank(map.get("dd2"))) {
+                    leader = departmentsStaffRelateService.selectLeaderByDepartmentId(map.get("dd2"));
+                    if(leader ==null  && StringUtil.isNotBlank(map.get("dd3"))){
+                        leader = departmentsStaffRelateService.selectLeaderByDepartmentId(map.get("dd3"));
+                    }
+                }
+            }
             flowDepartment = flowDepartmentService.selectByStaffId(leader.getStaffId());
             flowId = TypeFlowDto.getFlowId(flowDepartment.getFlowIds(), Constant.CHILD, type);//表示是部门下的普通员工
             list.add(flowDepartment);