Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java

@@ -175,7 +175,7 @@ public class ItemServiceImpl implements ItemService {
         }
         // 用户信息
         formDto.setUserId(userDetail.getUserId());
-        formDto.setNickName(userDetail.getNickname());
+        formDto.setNickName(formDto.getContactName());
         formDto.setUserFace(userDetail.getFaceImg());
         if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) {
             formDto.setIsPartyMember(YesOrNoEnum.YES.value());

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

@@ -329,9 +329,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
          * grid_ID:街道ID
          */
         itemEntity.setUserId("zfsq" + userDetail.getId());
-        itemEntity.setNickName(userDetail.getUsername());
+        itemEntity.setNickName(formDto.getContactName());
         itemEntity.setIsPartyMember(YesOrNoEnum.NO.value());
-        itemEntity.setMobile(userDetail.getMobile());
+        itemEntity.setMobile(formDto.getContactMobile());
         itemEntity.setDistributeTime(new Date());
         itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
         itemEntity.setGridId(userDetail.getDeptId());
@@ -1634,7 +1634,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE);
             }
             //备注
-            sendDto.setBZXX(dto.getOutHandleAdvice());
+            sendDto.setBZXX(dto.getHandleAdvice());
             Result<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
             DeptInfoCodeDTO deptInfo = deptResult.getData();
             if(deptInfo == null){