空指针问题

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

@@ -1314,7 +1314,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<ItemHandleProgressResultDTO> list = baseDao.selectListOfItemHandleProgressByMobile(itemId);
         // 处理多次拼接处理人信息问题
         for (ItemHandleProgressResultDTO dto : list) {
-            String advice = dto.getAdvice();
+            String advice = dto.getAdvice() == null ? "" : dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
             if (advice.contains("h_s") && advice.contains("   办理人：")) {
                 String hsStr = advice.substring(advice.indexOf("h_s"));
@@ -4025,6 +4025,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     /**
      * 根据经纬度查询部门下附近项目数据
+     *
      * @param params
      * @return
      */

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

@@ -1276,7 +1276,8 @@
             AND img.DEL_FLAG = '0'
         WHERE
             hp.DEL_FLAG = '0'
-            AND hp.ITEM_ID = #{itemId} UNION ALL
+            AND hp.ITEM_ID = #{itemId}
+        UNION ALL
         SELECT
             item.ID,
             item.EVALUATION_TIME AS createdTime,