修改在职党员报道不能按组织过滤数据的问题；

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);

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<ReportPartyDao, Repo
     }
 
     private QueryWrapper<ReportPartyEntity> getWrapper(Map<String, Object> params) {
+        QueryWrapper<ReportPartyEntity> 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<ReportPartyEntity> 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;
     }