社区管理员查询轮播图+报事报修查询优化

lin

2024-04-15 bdfb1bfaf5dc5d7318c632fcc6fdf3ffacbd075f

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

@@ -73,7 +73,10 @@
   public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskReportForRepairsVO.class, taskReportForRepairs);
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      String userRole = AuthUtil.getUserRole();
      if (RoleUtil.isProperty(userRole) || RoleUtil.isWgy(userRole)){
         taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      }
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
         if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
@@ -82,7 +85,6 @@
            taskReportForRepairs.setRoleType("inhabitant");
         }
      }
      String userRole = AuthUtil.getUserRole();
      List<String> aoiCodeList = new ArrayList<>();
      if (RoleUtil.isProperty(userRole)) {
         taskReportForRepairs.setRoleType("wy");
@@ -124,9 +126,10 @@
    */
   @Override
   public TaskReportStatistics getStatisticsCount(String houseCode) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, regionChildCodesList, isAdministrator);
      TaskReportForRepairsVO reportForRepairsVO = new TaskReportForRepairsVO();
      reportForRepairsVO.setHouseCode(houseCode);
      CommonParamSet invoke = new CommonParamSet<>().invoke(TaskReportForRepairsVO.class, reportForRepairsVO);
      return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode, invoke.getRegionChildCodesList(), invoke.getIsAdministrator());
   }

   /**