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

Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_1.0

Browse Source
This commit is contained in:
wulin 2020-08-26 14:23:27 +08:00
commit f6b811c2bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -101,9 +101,9 @@ public class ResultRecordController extends AbstractController {
List<DepartmentsDto> departmentList2 = new ArrayList<>(); List<DepartmentsDto> departmentList2 = new ArrayList<>();
List<DepartmentsDto> departmentList3 = new ArrayList<>(); List<DepartmentsDto> departmentList3 = new ArrayList<>();
List<DepartmentsDto> departmentList1 = departmentsService.selectByParentDepartmentId("1"); List<DepartmentsDto> departmentList1 = departmentsService.selectByParentDepartmentId("1");
String department1 = ""; String department1 = req.getDepartment1();
String department2 = ""; String department2 = req.getDepartment2();
String department3 = ""; String department3 = req.getDepartment3();
SysUserEntity user = getUser(); SysUserEntity user = getUser();
if (req.getIsSelf() == 1) { if (req.getIsSelf() == 1) {
req.setStaffId(user.getUserId()); req.setStaffId(user.getUserId());
@ -140,9 +140,9 @@ public class ResultRecordController extends AbstractController {
.put("departmentList1", departmentList1) .put("departmentList1", departmentList1)
.put("departmentList2", departmentList2) .put("departmentList2", departmentList2)
.put("departmentList3", departmentList3) .put("departmentList3", departmentList3)
.put("department1",department1) .put("department1", department1)
.put("department2",department2) .put("department2", department2)
.put("department3",department3); .put("department3", department3);
} }