From c5bb74ebc77cfe0ca11d727115aae3f97577fbe1 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Wed, 26 Aug 2020 17:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/flow/service/impl/RecordAuthServiceImpl.java   | 7 +++++--
 .../sys/service/app/impl/ResultRecordServiceImpl.java      | 3 +--
 src/main/resources/logback-dev.xml                         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

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 f5413cd0..19ae7d35 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
@@ -143,8 +143,11 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
 			return "";
 		} else {
 			DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
-			StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
-			return staffEntity.getName();
+			if (leader != null) {
+				StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
+				return staffEntity.getName();
+			}
+			return "";
 		}
 	}
 
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 77d4e0a0..70ea6a8f 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
@@ -331,7 +331,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。");
         }
         return R.ok();
-
     }
 
     @Override
@@ -347,7 +346,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         List<FlowDepartment> list = flowInfo.getSecond();
         List<FlowRelation> flowRelations = flowRelationService.selectFlowRelationAll();
         Map<String, FlowDepartment> staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p));
-        // approvalList = [ME,ONE_D,TWO_D,HR,BOSS]
+        //approvalList = [ME,ONE_D,TWO_D,HR,BOSS]
         List<String> approvalList = new ArrayList<>();
         approvalList.add("ME");
         for (FlowRelation flowRelation : flowRelations) {
diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml
index 47de9285..7004bf98 100644
--- a/src/main/resources/logback-dev.xml
+++ b/src/main/resources/logback-dev.xml
@@ -3,7 +3,7 @@
 
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <!-- 定义log文件的目录 -->
-    <property name="LOG_HOME" value="/home/admin/logs/lzmanagement"></property>
+    <property name="LOG_HOME" value="lzmanagement"></property>
 
 
     <conversionRule conversionWord="sampleClass"  converterClass="com.lz.common.layouts.SampleClassConverter" />