短信通知代码更改

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -110,7 +110,7 @@
     <!-- 根据部门id，查询部门下的所有用户手机号 -->
     <select id="getUserPhoneByListDeptId" resultType="String">
         SELECT
-        u.mobile mobile
+        distinct u.mobile mobile
         FROM
         sys_user u
         where u.del_flag = 0
@@ -125,19 +125,20 @@
     <!-- 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 -->
     <select id="getSysGridLeaderPhone" parameterType="Long" resultType="String">
         SELECT
-            c.mobile
+            distinct c.mobile
         FROM
             (
             SELECT DISTINCT
                 u.id,
                 u.mobile
             FROM
-                sys_role r
-                LEFT JOIN sys_role_user ru ON r.id = ru.role_id
-                LEFT JOIN sys_user u ON ru.user_id = u.id
-            WHERE
+                sys_role_data_scope d
+            LEFT JOIN sys_role r on d.role_id = r.id
+            LEFT JOIN sys_role_user ru on r.id = ru.role_id
+            LEFT JOIN sys_user u on ru.user_id = u.id
+            where
                 r.DEL_FLAG = 0
-                AND u.DEL_FLAG = 0
+                and u.DEL_FLAG = 0
                 AND r.type_key = 'gridLeader'
                 AND r.dept_id = #{deptId}
             ) c

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -215,4 +215,14 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2020-01-09 
      */ 
     List<Long> queryDeptIdList(String itemId, Long deptId);
+
+    /**
+     * @Description: 根据项目id，当前登录人所在部门id, 查询当前项目是由哪个部门吹哨而来
+     * @Param: [itemId] 项目id
+     * @Param: [deptId] 部门id
+     * @return:  java.util.List<java.lang.Long>  上级部门id
+     * @Author: zy
+     * @Date: 2020-01-14
+     */
+    List<Long> queryParentDeptId(@Param("itemId") String itemId, @Param("deptId") Long deptId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -1210,8 +1210,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
         } else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){
             if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应
-                deptId = baseDao.queryDeptIdList(dto.getId(),0L);
-                issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId);//当前登录人不是网格, 做回应处理，查询当前项目下的所有部门id，做去重处理，向部门下的所有人员发送短信
+                Long queryDePtId = user.getDeptId();
+                while (true){
+                    List<Long> createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId);
+                    if (createdDeptId != null && createdDeptId.size() > 0){
+                        for(Long ll : createdDeptId){
+                            deptId.add(ll);
+                            queryDePtId = ll;
+                        }
+                    }else{
+                        break;
+                    }
+                }
+                if (deptId != null && deptId.size() > 0) {
+                    issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId);//当前登录人不是网格, 做回应处理，查询当前项目下的所有部门id，做去重处理，向部门下的所有人员发送短信
+                }
             }
         }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -873,4 +873,21 @@
                 AND d.ITEM_ID = #{itemId}
             </if>
     </select>
+
+    <select id="queryParentDeptId" resultType="Long">
+        SELECT
+        distinct d.CREATED_DEPT_ID createdDeptId
+        FROM
+        epdc_item_Dept d
+        WHERE
+        d.DEL_FLAG = 0
+        AND d.DEPT_ID != 0
+        <if test='deptId != 0 and deptId != null'>
+            AND d.DEPT_ID = #{deptId}
+            AND d.CREATED_DEPT_ID != #{deptId}
+        </if>
+        <if test='itemId != "" and itemId != null'>
+            AND d.ITEM_ID = #{itemId}
+        </if>
+    </select>
 </mapper>