更改网格化平台拉入的错误数据导致的驳回管理详情复显报错问题

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

@@ -186,6 +186,8 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2019/9/16 10:11
      */
     ItemDetailForPCEndResultDTO selectOneOfItemDetailForPCEnd(String itemId);
+    ItemDetailForPCEndResultDTO getHandlerDeptIdByItemId(String itemId);
+
 
     /**
      * 项目处理进度

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

@@ -941,10 +941,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
         resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
 
-        // todo
+        // 处理详情获取存在多条1065的作物数据情况
+        Long handlerDeptId = 0L;
+        if(resultDTO.getHandlerDeptId() == 0){
+            ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
+            handlerDeptId = byItemId.getHandlerDeptId();
+        }else{
+            handlerDeptId = resultDTO.getHandlerDeptId();
+        }
 
         // 根据操作人部门，获取上一级部门ID
-        Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
+        Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId);
         if (sysDeptInfo.success()) {
             SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
 

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

@@ -1057,6 +1057,17 @@
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
     </select>
+    <select id="getHandlerDeptIdByItemId" resultType="com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO">
+        SELECT
+            ID,
+            HANDLER_DEPT_ID
+        FROM epdc_item_handle_process
+        where DEL_FLAG = '0'
+        and HANDLER_DEPT != '网格化平台'
+        and  ITEM_ID = #{itemId}
+        order by CREATED_TIME desc
+        LIMIT 1
+    </select>
     <select id="selectOneOfItemDetailForWork" resultMap="itemDetailMap">
         SELECT
             item.ID,