Browse Source

优化员工管理

jingbo 4 months ago
parent
commit
5a201b47fd

+ 16 - 1
src/main/java/com/jeesite/modules/mes/web/EmpUserCustomController.java

@@ -107,7 +107,9 @@ public class EmpUserCustomController extends BaseController {
             return view;
         }
 
-        return empUserController.form(empUser, op, model);
+        String view = empUserController.form(empUser, op, model);
+        applyEmployeePostName(model);
+        return view;
     }
 
     @RequestMapping(value = "save")
@@ -185,6 +187,19 @@ public class EmpUserCustomController extends BaseController {
         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) {
         if (employee != null && StringUtils.isNotBlank(employee.getUserCode())
                 && (StringUtils.isBlank(empUser.getUserCode()) || !StringUtils.equals(employee.getUserCode(), empUser.getUserCode()))) {

+ 1 - 1
src/main/resources/views/modules/sys/user/empUserForm.html

@@ -146,7 +146,7 @@
 						<div class="col-sm-8">
 							<#form:treeselect id="post" title="${text('岗位选择')}"
 							name="employee.postCode" value="${empUser.employee.postCode!}"
-							labelName="employeePostName" labelValue=""
+							labelName="employeePostName" labelValue="${employeePostName!}"
 							url="${ctx}/sys/post/treeData"
 							allowClear="true" canSelectParent="true"/>
 						</div>