From ee9528a579e721560b8b14be8caac3cb1d832b48 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 23 Aug 2021 09:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8E=E5=8D=97=E9=94=A6=E6=B0=B4-=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E4=B8=8A=E4=BC=A0-=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java | 5 +++++ .../service/impl/EnterpriseReportServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java index 708eeea7..a579d6a8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EnterpriseReportAddFormDTO.java @@ -101,4 +101,9 @@ public class EnterpriseReportAddFormDTO implements Serializable { private Long deptId; private String userId; + + /** + *信息修改标识 + */ + private String infoModifyId; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java index 70005da7..780363b9 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java @@ -209,7 +209,8 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl enterpriseReportEntities = baseDao.selectList(entityQueryWrapper); - if(enterpriseReportEntities.size()>1){ + String infoModifyId = enterpriseReportAddFormDTO.getInfoModifyId(); + if(enterpriseReportEntities.size()>1 ||infoModifyId.length()>0){ enterpriseReportEntity.setId(enterpriseReportEntities.get(0).getId()); baseDao.updateById(enterpriseReportEntity); return new Result();