wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-26 17:27:07 +08:00
parent e180784c50
commit c5bb74ebc7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java
View File

@ -143,8 +143,11 @@ public class RecordAuthServiceImpl extends ServiceImpl<RecordAuthMapper, RecordA
return ""; return "";
} else { } else {
DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId()); DepartmentsStaffRelateEntity leader = departmentsStaffRelateService.selectLeaderByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId()); if (leader != null) {
return staffEntity.getName(); StaffEntity staffEntity = staffService.selectStaffById(leader.getStaffId());
return staffEntity.getName();
}
return "";
} }
} }

3
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -331,7 +331,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。"); return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。");
} }
return R.ok(); return R.ok();
} }
@Override @Override
@ -347,7 +346,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
List<FlowDepartment> list = flowInfo.getSecond(); List<FlowDepartment> list = flowInfo.getSecond();
List<FlowRelation> flowRelations = flowRelationService.selectFlowRelationAll(); List<FlowRelation> flowRelations = flowRelationService.selectFlowRelationAll();
Map<String, FlowDepartment> staffEntityMap = list.stream().collect(Collectors.toMap(FlowDepartment::getDepartmentLevel, p -> p)); 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<>(); List<String> approvalList = new ArrayList<>();
approvalList.add("ME"); approvalList.add("ME");
for (FlowRelation flowRelation : flowRelations) { for (FlowRelation flowRelation : flowRelations) {

2
src/main/resources/logback-dev.xml
View File

@ -3,7 +3,7 @@
<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>--> <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
<!-- 定义log文件的目录 --> <!-- 定义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" /> <conversionRule conversionWord="sampleClass" converterClass="com.lz.common.layouts.SampleClassConverter" />