修改工作人员

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -10,6 +10,8 @@ import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.model.model.ModelQuery;
+import com.mortals.xhx.module.model.service.ModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,6 +61,8 @@ public class WorkmanController extends BaseCRUDJsonPhpController<WorkmanService,
     private RoleService roleService;
     @Autowired
     private RoleUserService roleUserService;
+    @Autowired
+    private ModelService modelService;
 
     public WorkmanController() {
         super.setFormClass(WorkmanForm.class);
@@ -88,6 +92,7 @@ public class WorkmanController extends BaseCRUDJsonPhpController<WorkmanService,
 
         this.addDict(model, "systemUserId", userCollect);
         this.addDict(model, "roleId", roleCollect);
+        this.addDict(model, "modelIds", modelService.find(new ModelQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getModelName())));
 
 
         super.init(request, response, form, model, context);

doc/api-two.md

@@ -7254,6 +7254,7 @@ msg|String|消息|-
 data|object|数据对象|-
  id|Long|序号，主键，自增长|-
  systemUserId|Long|系统用户id号|-
+ systemUserName|Long|系统用户名|-
  deptId|Long|部门id号|-
  deptName|String|部门名称|-
  windowId|Long|窗口id号|-
@@ -7428,8 +7429,9 @@ dict|object|字典对象|-
 
 参数名称|类型|备注|必填|其它
 ---|---|---|---|---
-userName|String|用户名|是|-
-password|String|密码|是|-
+loginName|String|用户名|是|-
+loginPwd|String|密码|是|-
+roleId|Long|权限Id|是|-
 deptId|Long|部门id号|是|-
 deptName|String|部门名称|是|-
 windowId|Long|窗口id号|是|-