From a0a39fdf0aef198965555bf12a036942eea75ea6 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 6 Aug 2024 16:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-cloud-commons-shibei | 2 +- .../item/service/impl/ItemServiceImpl.java | 22 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index aa34c3ead..edb5e42d1 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit aa34c3eadc59d0ebc055d7980cef773f49b954a2 +Subproject commit edb5e42d1b6dbe7c5c5bea11bd90215b9eabe4a8 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 8c5b6b62f..030ead707 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 @@ -3928,6 +3928,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())) ); +// log.info("11111111111111111111111111111111"+params.toString()); return new PageData<>(list, page.getTotal()); } @@ -6383,12 +6384,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Boolean changeHotLineToMSItem(ItemHotlineDTO dto) { - try { +// try { ItemHotlineEntity itemHotlineEntity = itemHotlineDao.selectById(dto.getId()); - if (itemHotlineEntity == null){ - throw new Exception("此id找不到12345热线数据"+dto.getId()); - } +// if (itemHotlineEntity == null){ +// throw new Exception("此id找不到12345热线数据"+dto.getId()); +// } ItemEntity itemEntity = new ItemEntity(); @@ -6432,7 +6433,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setAppealSource(NumConstant.THREE_STR); //djr String 登记人ID - itemEntity.setUserId(itemHotlineEntity.getDjr()); + if(StringUtils.isNotBlank(itemHotlineEntity.getDjr())){ + itemEntity.setUserId(itemHotlineEntity.getDjr()); + }else { + itemEntity.setUserId("111111111111"); + } + //djrxm String 登记人姓名 itemEntity.setNickName(itemHotlineEntity.getDjrxm()); //djsj String 登记时间 年-月-日 时:分:秒 @@ -6496,9 +6502,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHotlineEntity.setYqyFlag("1"); itemHotlineEntity.setStreetId(dto.getGridId()); itemHotlineDao.updateById(itemHotlineEntity); - }catch (Exception e){ - - } +// }catch (Exception e){ +// +// } return true; }