diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index a5332f21f..b99d93244 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -15,7 +15,7 @@
         <if test="pid != null and pid != ''">
             AND t1.pid = #{pid}
         </if>
-        <if test="eventContent != null and eventContent != ''">
+        <if test="typeKey != null and typeKey != ''">
             AND t1.type_key = #{typeKey}
         </if>
         order by t1.sort asc
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 5a0c927af..f3e4c8c8a 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
@@ -109,6 +109,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -130,9 +131,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private ItemDeptService itemDeptService;
 
-    @Autowired
-    private AdminFeignClient adminFeignClient;
-
     @Autowired
     private ItemHandleProcessService itemHandleProcessService;
 
@@ -175,6 +173,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private IssueOverseeResultsTask issueOverseeResultsTask;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Autowired
     private OssFeignClient ossFeignClient;
 
@@ -633,9 +634,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         data.setSbrlxfs(entity.getMobile());
         data.setSqzynr(entity.getItemContent());
         data.setSqdz(entity.getIssueAddress());
-        Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
+        double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        data.setSqxy(issueLatitude + "," + issueLongitude);
         data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
         //诉求登记人
         CityCaseLawenforcementdPersonDTO sqdjr = new CityCaseLawenforcementdPersonDTO();
@@ -738,7 +739,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 解析分类全部编码[前端分类复显使用]
         if (StringUtils.isNotBlank(resultDTO.getCategoryFullCode())) {
-            List<GategoryInfoWorkDetailResultDTO> categoryDtos = new ArrayList<GategoryInfoWorkDetailResultDTO>();
+            List<GategoryInfoWorkDetailResultDTO> categoryDtos = new ArrayList<>();
 
             String categoryFullCode = resultDTO.getCategoryFullCode();
             String[] categoryIds = categoryFullCode.split("-");
@@ -758,49 +759,60 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         }
 
+        // 处理详情获取存在多条1065的作物数据情况
+        Long handlerDeptId;
+        if (resultDTO.getHandlerDeptId() == 0) {
+            ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
+            handlerDeptId = byItemId.getHandlerDeptId();
+        } else {
+            handlerDeptId = resultDTO.getHandlerDeptId();
+        }
 
         // 对于存在有操作记录的数据，进行复显字段赋值
-        if (resultDTO.getHandlerDeptId() != null) {
+        if (handlerDeptId != null) {
             // 根据操作人部门，获取上一级部门ID
-            Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
-            SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
-            if ("community_party".equals(sysDeptDTO.getTypeKey())) {
-                ArrayList<String> list = new ArrayList();
-                list.add("历史遗留暂不具备解决条件的事项");
-                list.add("依法应当通过诉讼、仲裁、行政复议解决的事项");
-                list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项");
-                list.add("属于军队职责范围的事项");
-                list.add("涉及国家机密、商业秘密、个人隐私的事项");
-                list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项");
-                list.add("依法应当通过110、119、120等紧急服务专线处理的事项");
-                list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388");
-                list.add("不在市北区管辖范围的事项");
-                list.add("其他不予受理的事项");
-                if (list.contains(resultDTO.getHandleAdvice())) {
-                    resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue());
+            Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId);
+            if (sysDeptInfo.success()) {
+                SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
+                if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) {
+                    ArrayList<String> list = new ArrayList<>();
+                    list.add("历史遗留暂不具备解决条件的事项");
+                    list.add("依法应当通过诉讼、仲裁、行政复议解决的事项");
+                    list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项");
+                    list.add("属于军队职责范围的事项");
+                    list.add("涉及国家机密、商业秘密、个人隐私的事项");
+                    list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项");
+                    list.add("依法应当通过110、119、120等紧急服务专线处理的事项");
+                    list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388");
+                    list.add("不在市北区管辖范围的事项");
+                    list.add("其他不予受理的事项");
+                    if (list.contains(resultDTO.getHandleAdvice())) {
+                        resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue());
+                    } else {
+                        resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue());
+                    }
+                    // 拼凑处理人部门数组（社区）
+                    List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>();
+                    DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO();
+                    deptDto.setDeptId(resultDTO.getHandlerDeptId());
+                    deptDto.setDeptName(sysDeptDTO.getName());
+                    handlerDepts.add(deptDto);
+                    resultDTO.setHandlerDepts(handlerDepts);
                 } else {
-                    resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue());
+                    resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue());
+                    // 拼凑处理人部门数组（网格）
+                    List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>();
+                    DeptInfoWorkDetailResultDTO deptParentDto = new DeptInfoWorkDetailResultDTO();
+                    deptParentDto.setDeptId(sysDeptDTO.getPid());
+                    deptParentDto.setDeptName(sysDeptDTO.getParentName());
+                    handlerDepts.add(deptParentDto);
+                    DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO();
+                    deptDto.setDeptId(resultDTO.getHandlerDeptId());
+                    deptDto.setDeptName(sysDeptDTO.getName());
+                    handlerDepts.add(deptDto);
+                    resultDTO.setHandlerDepts(handlerDepts);
                 }
-                // 拼凑处理人部门数组（社区）
-                List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>();
-                DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO();
-                deptDto.setDeptId(resultDTO.getHandlerDeptId());
-                deptDto.setDeptName(sysDeptDTO.getName());
-                handlerDepts.add(deptDto);
-                resultDTO.setHandlerDepts(handlerDepts);
-            } else {
-                resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue());
-                // 拼凑处理人部门数组（网格）
-                List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>();
-                DeptInfoWorkDetailResultDTO deptParentDto = new DeptInfoWorkDetailResultDTO();
-                deptParentDto.setDeptId(sysDeptDTO.getPid());
-                deptParentDto.setDeptName(sysDeptDTO.getParentName());
-                handlerDepts.add(deptParentDto);
-                DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO();
-                deptDto.setDeptId(resultDTO.getHandlerDeptId());
-                deptDto.setDeptName(sysDeptDTO.getName());
-                handlerDepts.add(deptDto);
-                resultDTO.setHandlerDepts(handlerDepts);
+
             }
 
 
@@ -942,11 +954,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
 
         // 处理详情获取存在多条1065的作物数据情况
-        Long handlerDeptId = 0L;
-        if(resultDTO.getHandlerDeptId() == 0){
+        Long handlerDeptId;
+        if (resultDTO.getHandlerDeptId() == 0) {
             ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
             handlerDeptId = byItemId.getHandlerDeptId();
-        }else{
+        } else {
             handlerDeptId = resultDTO.getHandlerDeptId();
         }
 
@@ -1032,19 +1044,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         CompleteDeptDTO completeDeptDTO = completeDept.getData();
 
         // 是否已流转
-        boolean selected = false;
         boolean communitySelected = false;
-        boolean streetSelected = false;
         if (null != itemDeptDTOS && itemDeptDTOS.size() > 0) {
-            selected = true;
             // 判断已流转部门
             for (ItemDeptDTO dto : itemDeptDTOS) {
                 if (dto.getDeptId().equals(completeDeptDTO.getCommunityId())) {
                     communitySelected = true;
                 }
-                if (dto.getDeptId().equals(completeDeptDTO.getStreetId())) {
-                    streetSelected = true;
-                }
             }
         }
 
@@ -1300,7 +1306,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             String advice = dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
             if (advice.contains("h_s") && advice.contains("   办理人：")) {
-                String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
+                String hsStr = advice.substring(advice.indexOf("h_s"));
                 String adviceOld = advice.substring(0, advice.indexOf("   办理人："));
                 String adviceNew = adviceOld + hsStr;
                 dto.setAdvice(adviceNew);
@@ -1317,7 +1323,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         try {
             Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
             log.info("处理项目-deptMessage：" + deptMessage);
-            String typeKey = "";
+            String typeKey;
             if (0 == deptMessage.getCode()) {
                 typeKey = deptMessage.getData().toString();
             } else {
@@ -1371,7 +1377,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
                 itemCirculationDeptResultDTO.setSelected(false);
                 itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
-                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
+                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
                 deptList.add(itemCirculationDeptResultDTO);
                 dto.setDeptResultDTOS(deptList);
 
@@ -1443,7 +1449,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
                 itemCirculationDeptResultDTO.setSelected(false);
                 itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
-                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
+                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
                 deptList.add(itemCirculationDeptResultDTO);
                 dto.setDeptResultDTOS(deptList);
 
@@ -1580,7 +1586,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 // 拼接被吹哨部门
                 String whistlDept = "";
                 for (int i = 0; i < deptList.size(); i++) {
-                    ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
+                    ItemCirculationDeptResultDTO indexDto = deptList.get(i);
                     if (i == 0) {
                         whistlDept += indexDto.getDeptName();
                     } else {
@@ -1607,13 +1613,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
                 itemCirculationDeptResultDTO.setSelected(false);
                 itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
-                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
+                List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
                 deptList.add(itemCirculationDeptResultDTO);
 
                 // 拼接被吹哨部门
                 String whistlDept = "";
                 for (int i = 0; i < deptList.size(); i++) {
-                    ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
+                    ItemCirculationDeptResultDTO indexDto = deptList.get(i);
                     if (i == 0) {
                         whistlDept += indexDto.getDeptName();
                     } else {
@@ -2120,9 +2126,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         formDto.setContactMode(itemEntity.getMobile());
         double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude());
         // 坐标X
-        formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP));
+        formDto.setCoordX(BigDecimal.valueOf(gps[1]).setScale(15, RoundingMode.HALF_UP));
         // 坐标Y
-        formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP));
+        formDto.setCoordY(BigDecimal.valueOf(gps[0]).setScale(15, RoundingMode.HALF_UP));
         // 监督员编号
         formDto.setKeepersn("");
         // 操作时间
@@ -2256,9 +2262,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude());
         log.info("处理项目-gps结束");
         //X坐标（经纬度）
-        sendDto.setXZB(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP));
+        sendDto.setXZB(BigDecimal.valueOf(gps[1]).setScale(15, RoundingMode.HALF_UP));
         //Y坐标（经纬度）
-        sendDto.setYZB(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP));
+        sendDto.setYZB(BigDecimal.valueOf(gps[0]).setScale(15, RoundingMode.HALF_UP));
         //事件处理进度
         List<String> handleImagesList = new ArrayList<>();
         log.info("处理项目-获取进度开始");
@@ -2469,9 +2475,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //迁移图片到事件图片中去
             log.info("处理项目-迁移图片");
             if (null != ipr.getImages() && ipr.getImages().size() > 0) {
-                for (String image : ipr.getImages()) {
-                    handleImagesList.add(image);
-                }
+                handleImagesList.addAll(ipr.getImages());
                 ipr.setImages(null);
             }
             i++;
@@ -2572,7 +2576,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 notNeedCompressImgUrlList.add(image.getImgUrl());
             }
         }
-        if (null != needCompressImgUrlList && needCompressImgUrlList.size() > 0) {
+        if (needCompressImgUrlList.size() > 0) {
             //如果图片大于1M则需要压缩
             Result<List<String>> result = ossFeignClient.compressImg(needCompressImgUrlList);
             if (!result.success()) {
@@ -3261,18 +3265,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             code = result.getData().getCommunityDisCenterZoningCode();
             name = result.getData().getCommunity();
         }
-       /* data.setSqssjg(CityPushEnum.SBQS_SB.getCode());
-        data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/
+
         data.setSqssjg(code);
         data.setSqssjgmc(name);
         data.setSbrlxfs(entity.getMobile());
         data.setSqzynr(entity.getItemContent());
         data.setSqdz(entity.getIssueAddress());
-        Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
+        double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        data.setSqxy(issueLatitude + "," + issueLongitude);
         data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
-        //data.setJzrq();
+
         //诉求登记人
         CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO();
         sqdjr.setId(entity.getId());
@@ -3328,8 +3331,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             code = dtoResult.getData().getDisCenterZoningCode();
             name = dtoResult.getData().getName();
         }
-        /*data.setSqssjg(CityPushEnum.SBQS_SB.getCode());
-        data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/
+
         data.setSqssjg(code);
         data.setSqssjgmc(name);
         //组装企业数据
@@ -3345,9 +3347,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         data.setSbrlxfs(entity.getMobile());
         data.setSqzynr(entity.getItemContent());
         data.setSqdz(entity.getIssueAddress());
-        Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
-        data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
+        double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
+        data.setSqxy(issueLatitude + "," + issueLongitude);
         data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
         //诉求登记人
         CityCaseDevelopPersonDTO sqdjr = new CityCaseDevelopPersonDTO();
@@ -3356,7 +3358,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         sqdjr.setSsbm(entity.getGrid());
         sqdjr.setSsbmbm(entity.getGridId().toString());
         sqdjr.setSsjg(name);
-        /* sqdjr.setSsjgbm(getJgbm(entity.getGridId()));*/
+
         sqdjr.setSsjgbm(code);
         data.setSqdjr(sqdjr);
         List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index ab7b1df0d..29e4d3833 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -659,10 +659,18 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         data.setClzp(url.replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter));
         // 操作人
         AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
-        // 操作人姓名
-        dto.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername());
-        // 操作人员唯一标识
-        dto.setId(item.getCreatedBy());
+        if ("网格化平台".equals(item.getCreatedBy())) {
+            // 操作人姓名
+            dto.setXm(item.getGridPartyname());
+            // 操作人员唯一标识
+            dto.setId(item.getGridPartyid());
+        } else {
+            // 操作人姓名
+            dto.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername());
+            // 操作人员唯一标识
+            dto.setId(item.getCreatedBy());
+        }
+
         // 所属机构id
         dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
         // 所属机构名称