bug 修复

linwei

2024-01-18 ddf6452d487465e6fdfabc154bc46e0d2d0c6823

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

@@ -69,6 +69,7 @@
      if (null != dept) {
         taskReportForRepairs.setRegionCode(dept.getRegionCode());
      }
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      List<String> list = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("网格员")) {
@@ -76,11 +77,8 @@
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         } else if (taskReportForRepairs.getRoleName().equals("居民")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
            taskReportForRepairs.setConfirmUserId(null);
         }
      }
      if (AuthUtil.getUserRole().equals("wygly")) {
         taskReportForRepairs.setRegionCode("");
         taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      }
      return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
   }
@@ -91,8 +89,13 @@
    * @return
    */
   @Override
   public TaskReportStatistics getStatisticsCount() {
      return baseMapper.getStatisticsCount(AuthUtil.getUserId());
   public TaskReportStatistics getStatisticsCount(String houseCode) {
      String neiCode = "";
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null != dept) {
         neiCode = dept.getRegionCode();
      }
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, neiCode);
   }

   /**