维修查询设备部门长，仓储部部门长角色使用角色编码查询

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -466,6 +466,10 @@ public class SaveConstans {
          * 车间维修主管
          */
         public static final String WMS = "wms";
+        /**
+         * 仓储部部门长
+         */
+        public static final String STORAGE="role044";
     }
 
     /**
@@ -485,4 +489,6 @@ public class SaveConstans {
          */
         public static final String TRACK_STATUS = "track_status";
     }
+
+
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquMaintenanceOrderDao.java

@@ -2,7 +2,6 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.EquMaintenanceOrderDo;
-import com.rongwei.bsentity.domain.EquMaintenanceOrderVo;
 import com.rongwei.bsentity.dto.EquMaintenanceOrderSumDTO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -46,13 +45,13 @@ public interface EquMaintenanceOrderDao extends BaseMapper<EquMaintenanceOrderDo
             " WHERE 1 = 1 and FIND_IN_SET(a.ID,#{ids})" )
     List<EquMaintenanceOrderDo> selectOrderDataByIds( @Param("ids") String ids);
 
-    @Select("SELECT su.ID\n" +
-            "FROM sys_role sr \n" +
-            "LEFT JOIN sys_user_role sur ON sr.ID = sur.ROLEID and sur.DELETED = 0 \n" +
-            "LEFT JOIN sys_user su ON sur.USERID = su.ID and su.DELETED = 0 \n" +
-            "LEFT JOIN sys_user_org suo ON suo.USERID = su.ID AND suo.DELETED = 0 \n" +
-            "LEFT JOIN sys_organization so ON suo.ORGID = so.ID AND so.DELETED = 0 \n" +
-            "WHERE sr.NAME in('设备部部长','车间维修主管','设备部维修主管') \n")
-    List<String> selectRoleList();
+//    @Select("SELECT su.ID\n" +
+//            "FROM sys_role sr \n" +
+//            "LEFT JOIN sys_user_role sur ON sr.ID = sur.ROLEID and sur.DELETED = 0 \n" +
+//            "LEFT JOIN sys_user su ON sur.USERID = su.ID and su.DELETED = 0 \n" +
+//            "LEFT JOIN sys_user_org suo ON suo.USERID = su.ID AND suo.DELETED = 0 \n" +
+//            "LEFT JOIN sys_organization so ON suo.ORGID = so.ID AND so.DELETED = 0 \n" +
+//            "WHERE sr.NAME in('设备部部长','车间维修主管','设备部维修主管') \n")
+    List<String> selectRoleList(@Param("roleCodes") List<String> roleCode);
 
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquMaintenanceOrderService.java

@@ -27,7 +27,7 @@ public interface EquMaintenanceOrderService extends IService<EquMaintenanceOrder
      * 查询 取车间维修主管、设备部部长、设备部维修主管 角色中所有人员
      * @return
      */
-    List<String> selectRoleList();
+     List<String> selectRoleList(List<String> roleCode);
 
     /**
      * 维修单excel 生成
@@ -37,4 +37,6 @@ public interface EquMaintenanceOrderService extends IService<EquMaintenanceOrder
      * @return
      */
     String generateDeviceRepeatedlyFailsExcel(List<EquMaintenanceOrderSumDTO> list, String noticeId);
+
+
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquMaintenanceOrderServiceImpl.java

@@ -56,8 +56,8 @@ public class EquMaintenanceOrderServiceImpl extends ServiceImpl<EquMaintenanceOr
     }
 
     @Override
-    public List<String> selectRoleList() {
-        return equMaintenanceOrderDao.selectRoleList();
+    public List<String> selectRoleList(List<String> roleCode) {
+        return equMaintenanceOrderDao.selectRoleList(roleCode);
     }
 
     /**

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -44,6 +44,8 @@ import static com.rongwei.safecommon.utils.SaveConstans.FileName.PLANNING_TASK_F
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
+import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.HOED;
+import static com.rongwei.safecommon.utils.SaveConstans.RoleCode.STORAGE;
 
 /**
  * @author shangmi
@@ -333,7 +335,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
 
         // 3.消息提醒
         // 3.1发送人  取车间维修主管、设备部部长、设备部维修主管 角色中所有人员
-        List<String> userId = equMaintenanceOrderService.selectRoleList();
+         List<String> userId = equMaintenanceOrderService.selectRoleList(Arrays.asList(HOED, STORAGE));
         if (userId.isEmpty()) {
             log.info("车间维修主管、设备部部长、设备部维修主管角色无提醒人");
             return R.ok();

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquMaintenanceOrderDao.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.bscommon.sys.dao.EquMaintenanceOrderDao">
+    
+    <select id="selectRoleList" resultType="java.lang.String">
+        SELECT su.ID
+          FROM sys_role sr
+           LEFT JOIN sys_user_role sur ON sr.ID = sur.ROLEID and sur.DELETED = 0
+           LEFT JOIN sys_user su ON sur.USERID = su.ID and su.DELETED = 0
+           LEFT JOIN sys_user_org suo ON suo.USERID = su.ID AND suo.DELETED = 0
+           LEFT JOIN sys_organization so ON suo.ORGID = so.ID AND so.DELETED = 0
+        <where>
+            su.DELETED ='0'
+
+            <if test="roleCodes != null and roleCodes.size()>0">
+                AND sr.code in
+                <foreach collection="roleCodes" item="roleCode" open="(" close=")" separator=",">
+                    #{roleCode}
+                </foreach>
+            </if>
+
+        </where>
+        
+    </select>
+</mapper>