diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 0abe152c5..6925e70b1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { * @Date: 2019/9/16 10:11 */ ItemDetailForPCEndResultDTO selectOneOfItemDetailForPCEnd(String itemId); + ItemDetailForPCEndResultDTO getHandlerDeptIdByItemId(String itemId); + /** * 项目处理进度 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 3444e7c2e..5a0c927af 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem List 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 sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId()); + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId); if (sysDeptInfo.success()) { SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index b68068dcb..aadc7e767 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/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} +