Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_1.0
This commit is contained in:
commit
f6b811c2bf
@ -101,9 +101,9 @@ public class ResultRecordController extends AbstractController {
|
||||
List<DepartmentsDto> departmentList2 = new ArrayList<>();
|
||||
List<DepartmentsDto> departmentList3 = new ArrayList<>();
|
||||
List<DepartmentsDto> departmentList1 = departmentsService.selectByParentDepartmentId("1");
|
||||
String department1 = "";
|
||||
String department2 = "";
|
||||
String department3 = "";
|
||||
String department1 = req.getDepartment1();
|
||||
String department2 = req.getDepartment2();
|
||||
String department3 = req.getDepartment3();
|
||||
SysUserEntity user = getUser();
|
||||
if (req.getIsSelf() == 1) {
|
||||
req.setStaffId(user.getUserId());
|
||||
@ -140,9 +140,9 @@ public class ResultRecordController extends AbstractController {
|
||||
.put("departmentList1", departmentList1)
|
||||
.put("departmentList2", departmentList2)
|
||||
.put("departmentList3", departmentList3)
|
||||
.put("department1",department1)
|
||||
.put("department2",department2)
|
||||
.put("department3",department3);
|
||||
.put("department1", department1)
|
||||
.put("department2", department2)
|
||||
.put("department3", department3);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user