Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java

@@ -128,11 +128,13 @@

   @Override
   public IPage<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task) {
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
      // 民警角色
      if (AuthUtil.getUserRole().equals("mj")) {
         CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
         task.setUserId(AuthUtil.getUserId());
         return page.setRecords(baseMapper.selectTaskPageBy(page, task, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
         return page.setRecords(baseMapper.selectTaskPageBy(page, task,
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator()));
      } else {
         if (AuthUtil.getUserAccount().equals("18879306957")) {
            task.setCommunityCode("361102003027");
@@ -142,7 +144,12 @@
            task.setUserId(AuthUtil.getUserId());
         }
         // 非民警角色
         List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page, task);
         List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page,
            task,
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getGridCodeList(),
            commonParamSet.getIsAdministrator());
         // 返回
         return page.setRecords(taskVOS);
      }
   }
@@ -246,9 +253,7 @@
      // 消防隐患整改
      Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
      // 居住证申请
      taskVO.setReportType(2);
      Integer jzzsq = baseMapper.selectTaskCount(taskVO,commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
      Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
      // 设置
      objectObjectHashMap.put("qbhs", qbhs);// 取保候审
      objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易