巡检确认计划时pssr巡检也将同步计划状态；

修改锁开锁关主管查询；
删除根据用户岗位查询的权限；
修改锁开锁关主管选择器的list；
修改检修项目附件查看的dialog；

master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolPlanController.java

@@ -240,6 +240,7 @@ public class TPatrolPlanController extends BaseController {
                 tPssrPatrol.setPlanId(tPatrolPlan.getId());
                 for (TPssrPatrol pssrPatrol : tPssrPatrolService.selectTPssrPatrolList(tPssrPatrol)) {
                     pssrPatrol.setPlanStatus(2L);
+                    pssrPatrol.setApproveStatus(2L);
                     pssrPatrol.setConfirmDate(new Date());
                     pssrPatrol.setConfirmer(getUserId().toString());
                     pssrPatrol.setUpdatedate(new Date());

master/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -102,19 +103,14 @@ public class SysUserController extends BaseController
     public List<Map<String,Object>> listUserByMgrRegion(TStaffmgr tStaffmgr)
     {
         List<Map<String,Object>> list = userService.selectUserByMgrRegion(tStaffmgr);
-        Map<String, Object> map = new HashMap<>();
-        StringBuilder userId= new StringBuilder();
-        StringBuilder nickName= new StringBuilder();
-        for (Map<String, Object> user : list) {
-            if("芳烃抽提".equals(user.get("REGION"))||"汽油加氢".equals((user.get("REGION")))){
-                userId.append(user.get("USERID").toString()).append(",");
-                nickName.append(user.get("NICKNAME").toString()).append(",");
-            }
-        }
-        if (StringUtils.isNotEmpty(userId.toString())&&StringUtils.isNotEmpty(nickName.toString())) {
-            map.put("USERID", userId.substring(0, userId.length()-1));
-            map.put("NICKNAME", nickName.substring(0, nickName.length()-1));
-        }
+        list.forEach(item->{
+            item.entrySet().stream().forEach(entry->{
+                Object nickname = item.get("NICKNAME");
+                if (Objects.nonNull(nickname)){
+                    item.replace("NICKNAME",String.valueOf(nickname).replace(",","，"));
+                }
+            });
+        });
         return list;
     }
 

master/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java

@@ -40,7 +40,6 @@ public interface SysUserMapper
     public List<SysUser> selectUserByDept(Long deptId);
     public List<SysUser> selectAllUser();
 
-    @DataScope(deptAlias = "d")
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
 
     @DataScope(deptAlias = "d")

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectUserByMgrRegion" parameterType="tStaffmgr" resultType="map">
 		SELECT
 		a.region "REGION",
-		listagg ( b.NICK_NAME, '，' ) within GROUP ( ORDER BY a.region ) "NICKNAME",
+		listagg ( b.NICK_NAME, ',' ) within GROUP ( ORDER BY a.region ) "NICKNAME",
 		listagg ( b.user_id, ',' ) within GROUP ( ORDER BY a.region ) "USERID"
 		FROM
 		T_STAFFMGR a

ui/src/views/apply/offlinevalve/index.vue

@@ -590,7 +590,7 @@ export default {
       this.executorList = response;
     });
     listUserByMgrRegion().then(response => {
-      this.$confirmerList = response;
+      this.confirmerList = response;
     });
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
@@ -657,7 +657,7 @@ export default {
       console.log(this.form.executorName)
     },
     getConfirmerName(userId) {
-      for (const item of this.$confirmerList) {
+      for (const item of this.confirmerList) {
         if (userId === item.userId) {
           this.form.confirmerName = item.nickName;
           break;
@@ -764,7 +764,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      console.log(this.$confirmerList)
+      console.log(this.confirmerList)
       this.reset();
       this.open = true;
       this.title = "添加安全阀离线切出申请表";

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

@@ -680,7 +680,7 @@ export default {
     submitForm() {
       let flag = false
       this.subcontents.forEach(item => {
-        if (item.confirm == null || item.confirm == "") {
+        if (item.status === 1 && (item.confirm == null || item.confirm == "")) {
           this.$alert('请确认所有确认人都已选择！', '警告', {
             confirmButtonText: '确定'
           });

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

@@ -184,7 +184,7 @@
             type="text"
             icon="el-icon-folder"
 
-            @click="handleDoc(scope.row)"
+            @click="handleDocP(scope.row)"
           >附件
           </el-button>
           <el-button

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

@@ -185,7 +185,7 @@
             type="text"
             icon="el-icon-folder"
 
-            @click="handleDoc(scope.row)"
+            @click="handleDocP(scope.row)"
           >附件
           </el-button>
           <el-button

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

@@ -184,7 +184,7 @@
             type="text"
             icon="el-icon-folder"
 
-            @click="handleDoc(scope.row)"
+            @click="handleDocP(scope.row)"
           >附件
           </el-button>
           <el-button

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

@@ -170,7 +170,7 @@
             type="text"
             icon="el-icon-folder"
 
-            @click="handleDoc(scope.row)"
+            @click="handleDocP(scope.row)"
           >附件
           </el-button>
           <el-button