pssr：

-pssr用户查询
-检查项按钮删除按钮调换位置

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

@@ -248,7 +248,7 @@ public class TPssrAboveallController extends BaseController {
     @GetMapping("/listPssrUser")
     public AjaxResult listPssrUser(TPssrSubcontent sub) {
         SysUser user = new SysUser();
-        user.setDeptIds(new Long[]{103L,10042L,10058L});
+//        user.setDeptIds(new Long[]{103L,10042L,10058L});
         return AjaxResult.success(userService.selectPssrUser(user));
     }
     //endregion

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

@@ -305,7 +305,7 @@ public class TPssrFrameController extends BaseController {
     private int insertOrUpdate(TPssrFrame item) {
         TPssrFrame entity = new TPssrFrame();
         entity.setSubId(item.getSubId());
-        entity.setDevNo(item.getDevNo());
+        entity.setBracketNumber(item.getBracketNumber());
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(entity);
         if (CollectionUtils.isNotEmpty(list)) {
             item.setId(list.get(0).getId());

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

@@ -222,16 +222,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
     <select id="selectPssrUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id,u.staffid,u.home_type,u.sign_url, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
-		<if test="deptIds != null">
-			and d.DEPT_ID in
-			<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
-				#{deptId}
-			</foreach>
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
+		JOIN sys_dept d ON u.dept_id = d.dept_id
+		WHERE d.dept_id IN (
+		-- 递归查询，找到某个父级部门（假设传入的部门ID为 :parent_dept_id）的所有子部门
+		SELECT dept_id
+		FROM sys_dept
+		START WITH dept_id in (10040,10000,108)
+		CONNECT BY PRIOR dept_id = parent_id
+		)
 	</select>
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

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

@@ -82,16 +82,16 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除
+            icon="el-icon-document-copy"
+            @click="gotoSubIndex(scope.row)"
+          >检查项
           </el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-document-copy"
-            @click="gotoSubIndex(scope.row)"
-          >检查项
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除
           </el-button>
         </template>
       </el-table-column>