Merge branch 'dev_epidemic_situation' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -46,6 +46,7 @@ import com.epmet.service.IcNoticeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
@@ -197,7 +198,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
 
         //3.新增通知表信息
-        if (formDTO.getChannel().size() > NumConstant.ZERO) {
+        if (CollectionUtils.isNotEmpty(formDTO.getChannel())) {
             IcNatEntity icNatEntity = baseDao.selectById(formDTO.getIcNatId());
             //1.获取所填居民所属组织缓存信息
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(icNatEntity.getAgencyId());