人员查询

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

@@ -1492,18 +1492,18 @@ public class TPssrApproveController extends BaseController {
         TStaffmgr tStaffmgr = new TStaffmgr();
         tStaffmgr.setActualposts("24");//装置经理
         tStaffmgr.setDeptId(103L);
-        for (SysUser user : userService.selectUserPost(tStaffmgr)) {
+        for (SysUser user : userService.selectUserPostPssr(tStaffmgr)) {
             aboveall.setPlantMgr(user.getUserId());
             aboveall.setConfirm(user.getUserId().toString());
         }
 
         tStaffmgr.setActualposts("40");//ctm经理
-        for (SysUser user : userService.selectUserPost(tStaffmgr)) {
+        for (SysUser user : userService.selectUserPostPssr(tStaffmgr)) {
             aboveall.setCtmMgr(user.getUserId());
         }
 
         tStaffmgr.setActualposts("42");//cta经理
-        for (SysUser user : userService.selectUserPost(tStaffmgr)) {
+        for (SysUser user : userService.selectUserPostPssr(tStaffmgr)) {
             aboveall.setCtaMgr(user.getUserId());
         }
         List<String> executor = new ArrayList<>();

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

@@ -43,6 +43,8 @@ public interface SysUserMapper
     @DataScope(deptAlias = "d")
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
 
+    public List<SysUser> selectUserPostPssr(TStaffmgr tStaffmgr);
+
     @DataScope(deptAlias = "d")
     public List<Map<String,Object>> selectUserByMgrRegion(TStaffmgr tStaffmgr);
 

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

@@ -44,6 +44,7 @@ public interface ISysUserService
     public List<SysUser> selectAllUser();
 
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
+    public List<SysUser> selectUserPostPssr(TStaffmgr tStaffmgr);
 
     public List<Map<String,Object>> selectUserByMgrRegion(TStaffmgr tStaffmgr);
 

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

@@ -108,6 +108,11 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserPost(tStaffmgr);
     }
 
+    @Override
+    public List<SysUser> selectUserPostPssr(TStaffmgr tStaffmgr) {
+        return userMapper.selectUserPostPssr(tStaffmgr);
+    }
+
     @Override
     public List<Map<String,Object>> selectUserByMgrRegion(TStaffmgr tStaffmgr) {
         return userMapper.selectUserByMgrRegion(tStaffmgr);

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

@@ -73,6 +73,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 		${params.dataScope}
 	</select>
+	<select id="selectUserPostPssr" parameterType="tStaffmgr" resultMap="SysUserResult">
+		select b.USER_ID ,b.NICK_NAME ,b.STAFFID from T_STAFFMGR a
+		left join SYS_USER b on a.STAFFID=b.STAFFID
+		left join sys_dept d on a.dept_id = d.dept_id
+		left join T_WORKLICENSE e on e.EMPLOYEEID=a.STAFFID
+		<where>
+			<if test="actualposts != null  and actualposts != ''">
+				and a.actualpost in
+				<foreach collection="actualposts.split(',')" item="item" index="index"
+						 open="(" close=")" separator=",">
+					#{item}
+				</foreach>
+			</if>
+			<if test="deptId != null  and deptId != ''"> and a.dept_id=#{deptId}</if>
+			<if test="boiler != null"> and e.boiler=1</if>
+			<if test="cracking != null"> and e.cracking=1</if>
+			<if test="hotarea != null"> and e.hotarea=1</if>
+			<if test="coldarea != null"> and e.coldarea=1</if>
+			and a.DEL_FLAG=0
+			and b.USER_ID is not null
+		</where>
+		${params.dataScope}
+	</select>
 
 	<select id="selectUserByMgrRegion" parameterType="tStaffmgr" resultType="map">
 		SELECT