添加查询仓管员接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -49,6 +49,14 @@ public class TWarehouseInStockController extends BaseController {
     }
 
     /**
+     * 查询仓储仓管员角色用户
+     */
+    @GetMapping("/queryClerkRoleList")
+    public AjaxResult queryClerkRoleList() {
+        return itWarehouseBillsService.queryClerkRoleList();
+    }
+
+    /**
      * 查询入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:list')")

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -176,4 +176,11 @@ public interface SysUserMapper {
      * @return  结果
      */
     public SysUser selectUserByPhonenumber(String phonenumber);
+
+    /**
+     * 根据角色名称查询用户
+     * @param roleName
+     * @return
+     */
+    public List<SysUser> selectUserByRole(String roleName);
 }

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -102,7 +102,7 @@
     </select>
 
     <select id="selectRoleByName" parameterType="String" resultMap="SysRoleResult">
-        select role_id, role_name from sys_role where role_name = #{roleName}
+        select role_id, role_name from sys_role where role_name = #{roleName} and status = '0' and del_flag = '0'
     </select>
 
     <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -287,4 +287,21 @@
 			su.user_id
 	</select>
 
+    <select id="selectUserByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+		SELECT
+			u.user_id userId,
+			u.user_name userName,
+			u.nick_name nickName
+		FROM
+			sys_user u
+			LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+			LEFT JOIN sys_role r ON r.role_id = ur.role_id
+		WHERE
+			r.role_name = #{roleName}
+			AND u.STATUS = '0'
+			AND u.del_flag = '0'
+			AND r.STATUS = '0'
+			AND r.del_flag = '0'
+	</select>
+
 </mapper> 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -448,4 +448,9 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult calculateOutStockFee(Long fId);
+
+    /**
+     * 查询仓储仓管员角色用户
+     */
+    public AjaxResult queryClerkRoleList();
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -15,10 +15,7 @@ import com.ruoyi.basicData.domain.TWarehouseArea;
 import com.ruoyi.basicData.mapper.*;
 import com.ruoyi.basicData.service.impl.TWarehouseServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.core.domain.entity.*;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -39,10 +36,7 @@ import com.ruoyi.shipping.mapper.TWarehousebillsCntrMapper;
 import com.ruoyi.shipping.mapper.TWarehousebillsCntritemsMapper;
 import com.ruoyi.system.domain.SysCheckCode;
 import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.mapper.SysConfigMapper;
-import com.ruoyi.system.mapper.SysDeptMapper;
-import com.ruoyi.system.mapper.SysDictDataMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.*;
 import com.ruoyi.warehouseBusiness.domain.*;
 import com.ruoyi.warehouseBusiness.excel.*;
 import com.ruoyi.warehouseBusiness.mapper.*;
@@ -98,6 +92,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     private SysDeptMapper sysDeptMapper;
 
     @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Autowired
     private BillnoDelMapper billnoDelMapper;
 
     @Autowired
@@ -3602,6 +3599,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
+     * 查询仓储仓管员角色用户
+     */
+    @Override
+    public AjaxResult queryClerkRoleList() {
+        return AjaxResult.success(sysUserMapper.selectUserByRole("仓管员"));
+    }
+
+    /**
      * 仓储费计算提交以及暂存
      *
      * @param warehouseBills