feat(eoeg): 添加Eoeg用户岗位查询功能

- 替换TStaffmgr为TEoegStaffmgr以支持Eoeg业务场景
- 在SysUserMapper中新增selectEoegUserPost方法
- 在SysUserService中新增selectEoegUserPost接口
- 实现SysUserServiceImpl中的selectEoegUserPost方法
- 在SysUserMapper.xml中添加selectEoegUserPost查询语句
- 更新TEoegLockChangeController中岗位查询逻辑使用新方法

master/src/main/java/com/ruoyi/project/eoeg/controller/TEoegLockChangeController.java

@@ -20,10 +20,10 @@ import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.eoeg.domain.TEoegLock;
 import com.ruoyi.project.eoeg.domain.TEoegLockApply;
 import com.ruoyi.project.eoeg.domain.TEoegLockChange;
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
 import com.ruoyi.project.eoeg.service.ITEoegLockApplyService;
 import com.ruoyi.project.eoeg.service.ITEoegLockChangeService;
 import com.ruoyi.project.eoeg.service.ITEoegLockService;
-import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import io.jsonwebtoken.lang.Assert;
@@ -160,10 +160,10 @@ public class TEoegLockChangeController extends BaseController {
             variables.put("safaer", tEoegLockChange.getSafaer());
             variables.put("changeConfirmer", tEoegLockChange.getChangeConfirmer());
             //查询经理
-            TStaffmgr tStaffmgr = new TStaffmgr();
-            tStaffmgr.setActualposts("24,26");
+            TEoegStaffmgr tEoegStaffmgr = new TEoegStaffmgr();
+            tEoegStaffmgr.setActualposts("24,26");
             StringBuilder approvers = new StringBuilder();
-            for (SysUser user : sysUserService.selectUserPost(tStaffmgr)) {
+            for (SysUser user : sysUserService.selectEoegUserPost(tEoegStaffmgr)) {
                 approvers.append(user.getUserId().toString()).append(",");
             }
             if (StringUtils.isNotEmpty(approvers.toString())) {
@@ -171,10 +171,10 @@ public class TEoegLockChangeController extends BaseController {
             }
             variables.put("approver", approvers.toString());
             // 查询班长
-            tStaffmgr = new TStaffmgr();
-            tStaffmgr.setActualposts("12");
+            tEoegStaffmgr = new TEoegStaffmgr();
+            tEoegStaffmgr.setActualposts("12");
             StringBuilder monitor = new StringBuilder();
-            for (SysUser user : sysUserService.selectUserPost(tStaffmgr)) {
+            for (SysUser user : sysUserService.selectEoegUserPost(tEoegStaffmgr)) {
                 monitor.append(user.getUserId().toString()).append(",");
             }
             if (StringUtils.isNotEmpty(monitor.toString())) {
@@ -182,10 +182,10 @@ public class TEoegLockChangeController extends BaseController {
             }
             variables.put("monitor", monitor.toString());
             // 查询副班长
-            tStaffmgr = new TStaffmgr();
-            tStaffmgr.setActualposts("34");
+            tEoegStaffmgr = new TEoegStaffmgr();
+            tEoegStaffmgr.setActualposts("34");
             StringBuilder viceSquad = new StringBuilder();
-            for (SysUser user : sysUserService.selectUserPost(tStaffmgr)) {
+            for (SysUser user : sysUserService.selectEoegUserPost(tEoegStaffmgr)) {
                 viceSquad.append(user.getUserId().toString()).append(",");
             }
             if (StringUtils.isNotEmpty(viceSquad.toString())) {

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.system.mapper;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
@@ -44,6 +45,9 @@ public interface SysUserMapper
     @DataScope(deptAlias = "d")
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
 
+    @DataScope(deptAlias = "d")
+    public List<SysUser> selectEoegUserPost(TEoegStaffmgr tEoegStaffmgr);
+
     public List<SysUser> selectUserPostPssr(TStaffmgr tStaffmgr);
 
     @DataScope(deptAlias = "d")

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.system.service;
 
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.domain.SysUserRole;
@@ -44,6 +45,7 @@ public interface ISysUserService
     public List<SysUser> selectAllUser();
 
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr);
+    public List<SysUser> selectEoegUserPost(TEoegStaffmgr tEoegStaffmgr);
     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

@@ -5,6 +5,7 @@ import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.eoeg.domain.TEoegStaffmgr;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.system.domain.*;
 import com.ruoyi.project.system.mapper.*;
@@ -108,6 +109,10 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> selectUserPost(TStaffmgr tStaffmgr) {
         return userMapper.selectUserPost(tStaffmgr);
     }
+    @Override
+    public List<SysUser> selectEoegUserPost(TEoegStaffmgr tEoegStaffmgr) {
+        return userMapper.selectEoegUserPost(tEoegStaffmgr);
+    }
 
     @Override
     public List<SysUser> selectUserPostPssr(TStaffmgr tStaffmgr) {

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

@@ -73,6 +73,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 		${params.dataScope}
 	</select>
+	<select id="selectEoegUserPost" parameterType="tEoegStaffmgr" resultMap="SysUserResult">
+		select b.USER_ID ,b.NICK_NAME ,b.STAFFID from T_Eoeg_STAFFMGR a
+		left join SYS_USER b on a.STAFFID=b.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>
+			and a.DEL_FLAG=0
+			and b.USER_ID is not null
+		</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