|
@@ -107,7 +107,9 @@ public class EmpUserCustomController extends BaseController {
|
|
|
return view;
|
|
return view;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return empUserController.form(empUser, op, model);
|
|
|
|
|
|
|
+ String view = empUserController.form(empUser, op, model);
|
|
|
|
|
+ applyEmployeePostName(model);
|
|
|
|
|
+ return view;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@RequestMapping(value = "save")
|
|
@RequestMapping(value = "save")
|
|
@@ -185,6 +187,19 @@ public class EmpUserCustomController extends BaseController {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void applyEmployeePostName(Model model) {
|
|
|
|
|
+ EmpUser empUser = (EmpUser) model.asMap().get("empUser");
|
|
|
|
|
+ MesEmployee employee = findSelectedEmployee(empUser);
|
|
|
|
|
+ if (employee == null) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (empUser != null && empUser.getEmployee() != null
|
|
|
|
|
+ && StringUtils.isBlank(empUser.getEmployee().getPostCode())) {
|
|
|
|
|
+ empUser.getEmployee().setPostCode(employee.getPostCode());
|
|
|
|
|
+ }
|
|
|
|
|
+ model.addAttribute("employeePostName", employee.getPostName());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private String checkSelectedEmployee(EmpUser empUser, MesEmployee employee) {
|
|
private String checkSelectedEmployee(EmpUser empUser, MesEmployee employee) {
|
|
|
if (employee != null && StringUtils.isNotBlank(employee.getUserCode())
|
|
if (employee != null && StringUtils.isNotBlank(employee.getUserCode())
|
|
|
&& (StringUtils.isBlank(empUser.getUserCode()) || !StringUtils.equals(employee.getUserCode(), empUser.getUserCode()))) {
|
|
&& (StringUtils.isBlank(empUser.getUserCode()) || !StringUtils.equals(employee.getUserCode(), empUser.getUserCode()))) {
|