From 866d2ad8972ce846f4cd79bc0b2bef2e383546d2 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 3 Apr 2024 09:56:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E8=81=8C=E5=85=9A?= =?UTF-8?q?=E5=91=98=E6=8A=A5=E9=81=93=E4=B8=8D=E8=83=BD=E6=8C=89=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/party/controller/ReportPartyController.java | 6 ++++-- .../party/service/impl/ReportPartyServiceImpl.java | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java index 8a6e4989a..7ad0aeb34 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java @@ -101,8 +101,10 @@ public class ReportPartyController { resultDto.setUpdatedTime(new Date()); resultDto.setStatus(dto.getStatus()); reportPartyService.update(dto); - } else if (time <= 7) { - return new Result().error(-1, "距您上次报道时间：" + DateUtil.formatDate(resultDto.getUpdatedTime()) + "不足7日，请到期后修改报道信息！"); + +// } else if (time <= 7) { +// return new Result().error(-1, "距您上次报道时间：" + DateUtil.formatDate(resultDto.getUpdatedTime()) + "不足7日，请到期后修改报道信息！"); +// } else { dto.setUpdatedTime(new Date()); reportPartyService.update(dto); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java index f5feeb4b2..4da47717b 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java @@ -98,19 +98,23 @@ public class ReportPartyServiceImpl extends BaseServiceImpl getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper<>(); String id = (String) params.get(FieldConstant.ID_HUMP); String name = (String) params.get(FieldConstant.NAME_HUMP); String idCard = (String) params.get(FieldConstant.ID_CARD_HUMP); String mobile = (String) params.get(FieldConstant.MOBILE_HUMP); - String deptId = (String) params.get("deptId"); String workUnit = (String) params.get("workUnit"); - QueryWrapper wrapper = new QueryWrapper<>(); + String deptId = (String) params.get("deptId"); + if (StringUtils.isEmpty(deptId)) { + UserDetail user = SecurityUser.getUser(); + deptId = String.valueOf(user.getDeptId()); + wrapper.eq(StringUtils.isNotBlank(deptId), "DEPT_ID", deptId); + } wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name); wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard); wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile); wrapper.like(StringUtils.isNotBlank(workUnit), "WORK_UNIT", workUnit); - wrapper.likeLeft(StringUtils.isNotBlank(deptId), "PARENT_DEPT_IDS", deptId); return wrapper; }