短信通知 - bug修改

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

@@ -1202,9 +1202,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
                 ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){
             deptId = baseDao.queryDeptIdList(dto.getId(),user.getDeptId());
-            issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId);//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
+            if (deptId != null && deptId.size() > 0){
+                issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId);//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
+            }
         } else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){
-            if (user.getTypeKey() != OrganizationTypeConstant.ORG_TYPE_GRID_PARTY){//回应
+            if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应
                 deptId = baseDao.queryDeptIdList(dto.getId(),0L);
                 issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId);//当前登录人不是网格, 做回应处理，查询当前项目下的所有部门id，做去重处理，向部门下的所有人员发送短信
             }

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/mapper/SmsTemplateDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.SmsTemplateDao">
 
-    <select id="selectOneSmsTemplateInfoByType" resultType="com.elink.esua.epdc.dao.SmsTemplateDao">
+    <select id="selectOneSmsTemplateInfoByType" resultType="com.elink.esua.epdc.dto.SmsTemplateDTO">
         SELECT * FROM epdc_sms_template WHERE DEL_FLAG = '0' AND ENABLE_FLAG = '1' AND TEMPLATE_TYPE = #{smsTemplateType}
     </select>