bug 修复

linwei

2024-01-19 494aeb58eb885b40ab2fdb083aaa79007bb79ae2

 src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java

@@ -22,6 +22,7 @@
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -71,10 +72,8 @@

   @Override
   public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null != dept) {
         propertyCapitalApply.setRegionCode(dept.getRegionCode());
      }
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      // 判断角色，物业角色只能查询当前小区的
      String userRole = AuthUtil.getUserRole();
      if (userRole.contains("wygly")) {
@@ -86,7 +85,7 @@
            return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
         }
      }
      return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
      return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply,regionChildCodesList,isAdministrator));
   }

   @Autowired
@@ -135,12 +134,25 @@
         } catch (Exception e) {
            throw new ServiceException("街道信息不存在");
         }
         // 查询住建局负责人
         // 查询信州区住建局负责人
         User user4 = null;
         try {
            Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
            Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, region2.getName() + "住建局").last("limit 1"));
//            Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
            Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
            user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
               .eq(User::getRoleId, "1738072768615333890")
               .eq(User::getIsDeleted, 0)
               .last("limit 1"));
         } catch (Exception e) {
            throw new ServiceException("住建局信息不存在");
         }

         // 查询上饶市住建局负责人
         User user5 = null;
         try {
//            Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
            Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
            user5 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
               .eq(User::getRoleId, "1738072768615333890")
               .eq(User::getIsDeleted, 0)
               .last("limit 1"));
@@ -160,6 +172,7 @@
               .set("ownersCommitteeUser", TaskUtil.getTaskUser(one.getPrincipalId().toString()))
               .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
               .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
               .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
               .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
               .set("ownersCommitteeFlag", ownersCommitteeFlag);
         } else {
@@ -177,6 +190,7 @@
               .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
               .set("streetUser", TaskUtil.getTaskUser(one4.getId().toString()))
               .set("constructionUser", TaskUtil.getTaskUser(user4.getId().toString()))
               .set("srConstructionUser", TaskUtil.getTaskUser(user5.getId().toString()))
               .set("applyUser", TaskUtil.getTaskUser(AuthUtil.getUserId().toString()))
               .set("ownersCommitteeFlag", ownersCommitteeFlag);
         }