bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -41,6 +41,7 @@
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
@@ -51,6 +52,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * 物业维修资金申请表 服务实现类
@@ -63,6 +66,16 @@

   @Override
   public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
      // 判断角色，物业角色只能查询当前小区的

      String userRole = AuthUtil.getUserRole();
      if (userRole.contains("wygly")) {
         IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         propertyCapitalApply.setDistrictIdList(strings);
      }


      return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
   }

@@ -84,6 +97,8 @@
      IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
      OwnersCommitteeEntity one = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
         .eq(OwnersCommitteeEntity::getAreaId, applyVO.getDistrictId())
         .eq(OwnersCommitteeEntity::getDeleteFlag,0)
         .eq(OwnersCommitteeEntity::getStatus,0)
         .last("limit 1"));
      Integer ownersCommitteeFlag = CommonConstant.NUMBER_TWO;
      if (one != null && one.getPrincipalId() != null) {
@@ -104,6 +119,7 @@
            Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9)));
            Dept one3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, one2.getName()));
            one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId())
               .eq(User::getRoleId,"1729814500990304258")
               .eq(User::getIsDeleted,0)
               .last("limit 1"));
         } catch (Exception e) {
@@ -115,6 +131,7 @@
            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"));
            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) {