PSSR 用户查询

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -10,6 +10,8 @@ import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.reliability.domain.TSafetyvavle;
 import com.ruoyi.project.reliability.service.ITSafetyvavleService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -71,6 +73,9 @@ public class TPssrAboveallController extends BaseController {
     @Autowired
     private TPssrApproveController tPssrApproveController;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询PSSR列表
      */
@@ -166,11 +171,11 @@ public class TPssrAboveallController extends BaseController {
                         query.setSubId(subcontent.getId());
                         boolean flag = true;
                         for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
-                            if (patrol.getApproveStatus()!=2){
+                            if (patrol.getApproveStatus() != 2) {
                                 flag = false;
                             }
                         }
-                        if (flag){
+                        if (flag) {
                             tPssrApproveController.doApprove(subcontent.getId());
                         }
                     } else if (subcontent.getForShort().equals("txjk")) {
@@ -187,11 +192,11 @@ public class TPssrAboveallController extends BaseController {
                         query.setSubId(subcontent.getId());
                         boolean flag = true;
                         for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
-                            if (patrol.getApproveStatus()!=2){
+                            if (patrol.getApproveStatus() != 2) {
                                 flag = false;
                             }
                         }
-                        if (flag){
+                        if (flag) {
                             tPssrApproveController.doApprove(subcontent.getId());
                         }
                     } else if (subcontent.getForShort().equals("bxsjcy")) {
@@ -206,11 +211,11 @@ public class TPssrAboveallController extends BaseController {
                         query.setSubId(subcontent.getId());
                         boolean flag = true;
                         for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
-                            if (patrol.getApproveStatus()!=2){
+                            if (patrol.getApproveStatus() != 2) {
                                 flag = false;
                             }
                         }
-                        if (flag){
+                        if (flag) {
                             tPssrApproveController.doApprove(subcontent.getId());
                         }
                     } else if (subcontent.getForShort().equals("yfl")) {
@@ -237,21 +242,20 @@ public class TPssrAboveallController extends BaseController {
     }
 
     private void genRsfh(Long subId, String userId) {
-        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"被保温的管道/设备保温防护层外观完好，无缺失。",userId,new Date()));
-        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"保温层连接密封处严密，无管道/设备裸露。",userId,new Date()));
-        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId,"管道/设备上的保温层不妨碍操作人员进行现场作业。",userId,new Date()));
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId, "被保温的管道/设备保温防护层外观完好，无缺失。", userId, new Date()));
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId, "保温层连接密封处严密，无管道/设备裸露。", userId, new Date()));
+        tPssrProtectionService.insertTPssrProtection(new TPssrProtection(subId, "管道/设备上的保温层不妨碍操作人员进行现场作业。", userId, new Date()));
     }
 
     private void genXcws(Long subId, String userId) {
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"现场地面无油渍，积水等。",userId,new Date()));
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"现场无检修施工后的残留物(碎屑, 密封材料, 螺栓，保温材料等) 。",userId,new Date()));
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"所需材料安全堆放在指定区域。 ",userId,new Date()));
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"工器具整齐的放置在指定区域。",userId,new Date()));
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"地沟、污水管网、污水井、清净下水管网、清净下水管井内无杂物，且畅通无阻。",userId,new Date()));
-        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId,"无多余的脚手架，现存的脚手架不影响操作人员进行现场作业。",userId,new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "现场地面无油渍，积水等。", userId, new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "现场无检修施工后的残留物(碎屑, 密封材料, 螺栓，保温材料等) 。", userId, new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "所需材料安全堆放在指定区域。 ", userId, new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "工器具整齐的放置在指定区域。", userId, new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "地沟、污水管网、污水井、清净下水管网、清净下水管井内无杂物，且畅通无阻。", userId, new Date()));
+        tPssrHygieneService.insertTPssrHygiene(new TPssrHygiene(subId, "无多余的脚手架，现存的脚手架不影响操作人员进行现场作业。", userId, new Date()));
     }
 
-
     /**
      * 生成临时电源数据
      */
@@ -397,4 +401,13 @@ public class TPssrAboveallController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrAboveallService.deleteTPssrAboveallByIds(ids));
     }
+
+    /**
+     * 查询pssr相关用户
+     */
+    @GetMapping("/listPssrUser")
+    public AjaxResult listPssrUser(TPssrSubcontent sub) {
+        SysUser user = new SysUser();
+        return AjaxResult.success(userService.selectPssrUser(user));
+    }
 }

master/src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -22,6 +22,7 @@ public interface ISysUserService
      * @return 用户信息集合信息
      */
     public List<SysUser> selectUserList(SysUser user);
+    public List<SysUser> selectPssrUser(SysUser user);
 
     public List<SysUser> selectUserListByRoleAndDept(SysUser user);
 

master/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -65,6 +65,12 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserList(user);
     }
 
+    @Override
+    public List<SysUser> selectPssrUser(SysUser user)
+    {
+        return userMapper.selectUserList(user);
+    }
+
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserListByRoleAndDept(SysUser user)

ui/src/api/pssr/aboveall.js

@@ -61,3 +61,12 @@ export function exportAboveall(query) {
     params: query
   })
 }
+
+// 导出PSSR
+export function getPssrUser(query) {
+  return request({
+    url: '/pssr/aboveall/listPssrUser',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/pssr/aboveall/index.vue

@@ -278,7 +278,7 @@ import {
   addAboveall,
   delAboveall,
   exportAboveall,
-  getAboveall,
+  getAboveall, getPssrUser,
   importTemplate,
   listAboveall,
   updateAboveall
@@ -289,7 +289,6 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listPssrModel} from "@/api/pssr/pssrModel";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
 import {listSubcontent} from "@/api/pssr/subcontent";
 
 export default {
@@ -380,7 +379,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/airtight/index.vue

@@ -354,7 +354,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -477,7 +477,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser().then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/analyzer/index.vue

@@ -336,7 +336,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -456,7 +456,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/blind/index.vue

@@ -435,7 +435,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -577,7 +577,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/circuit/index.vue

@@ -402,7 +402,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import {listFile} from "@/api/pssr/file";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -528,7 +528,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/cleaning/index.vue

@@ -345,7 +345,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -466,7 +466,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/frame/index.vue

@@ -377,7 +377,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -502,7 +502,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/franklinism/index.vue

@@ -300,7 +300,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -420,7 +420,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/gasdetector/index.vue

@@ -313,7 +313,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -433,7 +433,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/hygiene/index.vue

@@ -363,7 +363,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
@@ -480,7 +480,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/instrumentCalibration/index.vue

@@ -327,7 +327,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -448,7 +448,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/laboratory/index.vue

@@ -329,7 +329,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -439,7 +439,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
 

ui/src/views/pssr/lighting/index.vue

@@ -302,7 +302,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -423,7 +423,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/lock/index.vue

@@ -378,7 +378,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {listLockPid} from "@/api/apply/lock";
@@ -517,7 +517,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     listLockPid({subId: this.subId}).then(res => {

ui/src/views/pssr/material/index.vue

@@ -368,7 +368,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 
 export default {
@@ -484,7 +484,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/materialRaw/index.vue

@@ -395,7 +395,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 
 export default {
@@ -512,7 +512,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/measure/index.vue

@@ -352,7 +352,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMocBatch} from "@/api/pssr/moc";
@@ -478,7 +478,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/moc/index.vue

@@ -362,7 +362,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -483,7 +483,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/motor/index.vue

@@ -320,7 +320,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -440,7 +440,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/nitrogen/index.vue

@@ -341,7 +341,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -465,7 +465,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -422,7 +422,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
@@ -594,7 +594,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/overhaulFilter/index.vue

@@ -430,7 +430,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
 import {getSubcontent} from "@/api/pssr/subcontent";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
@@ -614,7 +614,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/overhaulPipe/index.vue

@@ -290,7 +290,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
@@ -408,7 +408,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/overhaulPump/index.vue

@@ -302,7 +302,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
@@ -421,7 +421,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/overhaulTower/index.vue

@@ -421,7 +421,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {getSubcontent} from "@/api/pssr/subcontent";
@@ -585,7 +585,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/overhaulValve/index.vue

@@ -416,7 +416,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {groupList} from "@/api/pssr/region";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {getSubcontent} from "@/api/pssr/subcontent";
 import {doApprove} from "@/api/pssr/approve";
@@ -590,7 +590,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     groupList({}).then(res => {

ui/src/views/pssr/pipe/index.vue

@@ -420,7 +420,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 
 export default {
@@ -540,7 +540,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/power/index.vue

@@ -299,7 +299,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -414,7 +414,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/programme/index.vue

@@ -354,7 +354,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listTrainingbcc} from "@/api/training/trainingbcc";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -488,7 +488,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
     listTrainingbcc({isFinish: 1,trainingType:'14'}).then(res => {

ui/src/views/pssr/protection/index.vue

@@ -313,7 +313,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -436,7 +436,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/public/index.vue

@@ -454,7 +454,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -556,7 +556,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/pumpCleaning/index.vue

@@ -335,7 +335,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
@@ -460,7 +460,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/pumpFill/index.vue

@@ -344,7 +344,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
@@ -468,7 +468,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/pumpOverhaul/index.vue

@@ -334,7 +334,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
@@ -456,7 +456,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/region/index.vue

@@ -224,7 +224,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {updateMaterialBatch} from "@/api/pssr/material";
 
 export default {
@@ -321,7 +321,7 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight - 350
     })
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
       this.getList();
       this.getTreeselect();

ui/src/views/pssr/safetyBleed/index.vue

@@ -367,7 +367,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {handleConfirmBleed, handleTurnDownBleed} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
@@ -497,7 +497,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/safetyBreath/index.vue

@@ -367,7 +367,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {handleConfirmBreath, handleTurnDownBreath} from "@/api/pssr/safety";
@@ -493,7 +493,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/safetyBrust/index.vue

@@ -377,7 +377,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {handleConfirmBrust, handleTurnDownBrust} from "@/api/pssr/safety";
@@ -503,7 +503,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -357,7 +357,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {handleconfirmFlamearrester, handleturnDownFlamearrester} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
@@ -479,7 +479,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/safetyValve/index.vue

@@ -356,7 +356,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {handleconfirmValve, handleturnDownValve} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
@@ -479,7 +479,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/subcontent/index.vue

@@ -177,7 +177,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 
 export default {
   dicts: ['pssr_approve_status'],
@@ -284,7 +284,7 @@ export default {
     }
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/torchvoc/index.vue

@@ -317,7 +317,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {updateMaterialBatch} from "@/api/pssr/material";
@@ -436,7 +436,7 @@ export default {
       })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },

ui/src/views/pssr/vessel/index.vue

@@ -433,7 +433,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
-import {listUserNoPage} from "@/api/system/user";
+import {getPssrUser} from "@/api/pssr/aboveall";
 import {listFile} from "@/api/pssr/file";
 
 export default {
@@ -554,7 +554,7 @@ export default {
     })
     this.getList();
     this.getTreeselect();
-    listUserNoPage({}).then(res => {
+    getPssrUser({}).then(res => {
       this.userOptions = res.data
     });
   },