修改人员筛选离职与否

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@@ -998,8 +998,7 @@ public class DepositoryController {
         // 用于查询对应的管理员权限
         Map<String, Object> paramForUserManager = new HashMap<>();
         paramForUserManager.put("depositoryId", did);
-        List<UserByPort> list = new ArrayList<>();
-        ;
+        List<UserByPortP> list = new ArrayList<>();
         List<RoleAndDepository> roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(paramForUserManager);
         for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) {
             int classes = roleAndDepository.getClasses();
@@ -1012,7 +1011,7 @@ public class DepositoryController {
                 if (emptype > 10) {
                     continue;
                 }
-                list.add(userByPort);
+                list.add(new UserByPortP(userByPort));
             } else {
                 // 如果是对岗位
 
@@ -1026,11 +1025,10 @@ public class DepositoryController {
                     if (emptype > 10) {
                         continue;
                     }
-                    list.add(userByPort);
+                    list.add(new UserByPortP(userByPort));
                 }
             }
         }
-
         int size = list.size();
         return new RestResponse(list, size, 200);
     }

src/main/resources/templates/pages/warehouse/manager.html

@@ -35,7 +35,6 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-255',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit
@@ -64,39 +63,9 @@
                             }
                         }
                     },
-                    {
-                        field: 'state', title: '状态', minWidth: 80, sort: true, templet: function (d) {
-                            if (d.state == 1) {
-                                return "启用";
-                            } else if (d.state == 2) {
-                                return "禁用";
-                            }
-                        }
-                    },
-                    {
-                        field: 'health', title: '健康状况', minWidth: 160, sort: true, templet: function (d) {
-                            switch (d.health) {
-                                case 1:
-                                    return "良好";
-                                case 2:
-                                    return "一般";
-                                case 3:
-                                    return "较弱";
-                                case 4:
-                                    return "有生理缺陷";
-                                case 5:
-                                    return "残废";
-                                default:
-                                        return "";
-                            }
-                        }
-                    },
-                    {field: 'mobilephone', width: 200, title: '内线电话', sort: true},
+                    {field: 'mobilephone', width: 150, title: '内线电话', sort: true},
                     {field: 'companyname', width: 200, title: '公司名称', sort: true},
                     {field: 'maindeparmentname', width: 200, title: '主部门', sort: true},
-                    {field: 'sunmaindeparmentname', width: 200, title: '岗位', sort: true},
-                    {field: 'workpostname', width: 200, title: '工段', sort: true},
-                    {field: 'positionname', width: 200, title: '职位', sort: true},
                 ]
             ],
             limits: [10, 15, 20, 25, 50, 100],

target/classes/templates/pages/warehouse/manager.html

@@ -35,7 +35,6 @@
                     "data": res.data //解析数据列表
                 };
             },
-            height: 'full-255',//固定高度-即固定表头固定第一行首行
             request: {
                 pageName: 'page', //页码的参数名称，默认：page
                 limitName: 'size' //每页数据量的参数名，默认：limit
@@ -64,39 +63,9 @@
                             }
                         }
                     },
-                    {
-                        field: 'state', title: '状态', minWidth: 80, sort: true, templet: function (d) {
-                            if (d.state == 1) {
-                                return "启用";
-                            } else if (d.state == 2) {
-                                return "禁用";
-                            }
-                        }
-                    },
-                    {
-                        field: 'health', title: '健康状况', minWidth: 160, sort: true, templet: function (d) {
-                            switch (d.health) {
-                                case 1:
-                                    return "良好";
-                                case 2:
-                                    return "一般";
-                                case 3:
-                                    return "较弱";
-                                case 4:
-                                    return "有生理缺陷";
-                                case 5:
-                                    return "残废";
-                                default:
-                                        return "";
-                            }
-                        }
-                    },
-                    {field: 'mobilephone', width: 200, title: '内线电话', sort: true},
+                    {field: 'mobilephone', width: 150, title: '内线电话', sort: true},
                     {field: 'companyname', width: 200, title: '公司名称', sort: true},
                     {field: 'maindeparmentname', width: 200, title: '主部门', sort: true},
-                    {field: 'sunmaindeparmentname', width: 200, title: '岗位', sort: true},
-                    {field: 'workpostname', width: 200, title: '工段', sort: true},
-                    {field: 'positionname', width: 200, title: '职位', sort: true},
                 ]
             ],
             limits: [10, 15, 20, 25, 50, 100],