Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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