添加用户所属员工

attendance-performance-manager-ui/admin/src/views/system/user/list.vue

@@ -430,6 +430,13 @@ export default {
             formatter: this.formatter,
             align: "center",
           },
+
+          {
+            prop: "customerId",
+            label: "所属员工",
+            formatter: this.formatter,
+            align: "center",
+          },
           {
             prop: "roleIds",
             label: "所属角色",

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.common.code.UserStatus;
 import com.mortals.xhx.common.code.UserType;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.staff.service.StaffService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     @Autowired
     private DeptService deptService;
 
+    @Autowired
+    private StaffService staffService;
+
     public UserController() {
         super.setModuleDesc("用户信息");
     }
@@ -62,6 +66,8 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
 
+        this.addDict(model, "customerId",  staffService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
+
     }
 
     @Override