Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
@@ -85,7 +86,7 @@
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      // 判断角色，物业角色只能查询当前小区的
      String userRole = AuthUtil.getUserRole();
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
      if (RoleUtil.isProperty(userRole)) {
         // 查询小区id
         IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
@@ -156,7 +157,7 @@
               .eq(Dept::getDeptName, regionServiceOne.getName()));

            jdUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, deptServiceOne.getId())
               .eq(User::getRoleId, "1729814500990304258").eq(User::getIsDeleted, 0).last("limit 1"));
               .like(User::getRoleId, "1729814500990304258").eq(User::getIsDeleted, 0).last("limit 1"));
            if (jdUserInfo == null) {
               logger.error("街道信息不存在***");
               throw new ServiceException("街道信息不存在");
@@ -171,7 +172,7 @@
//            Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
            Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "信州区" + "住建局").last("limit 1"));
            xzUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
               .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
               .like(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
            if (xzUserInfo == null) {
               logger.error("信州区住建局信息不存在***");
               throw new ServiceException("信州区住建局信息不存在");
@@ -187,7 +188,7 @@
//            Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
            Dept dept3 = deptService.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, "上饶市" + "住建局").last("limit 1"));
            srUserInfo = userService.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
               .eq(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
               .like(User::getRoleId, "1738072768615333890").eq(User::getIsDeleted, 0).last("limit 1"));
            if (srUserInfo == null) {
               logger.error("上饶市住建局信息不存在***");
               throw new ServiceException("上饶市住建局信息不存在");