物业bug修复

lin

2024-02-26 463f76d8fd91a13099ff676640aee4d9f60f756a

物业bug修复

 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java

@@ -90,7 +90,7 @@
        // 判断角色，物业角色只能查询当前小区的
        String userRole = AuthUtil.getUserRole();
        if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
            // if (district.getFilterFlag().equals(1)) {
             if (district.getFilterFlag().equals(1)) {
            // 查询小区id
            IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
            List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
@@ -112,7 +112,7 @@
            if (districtIds.size() == 0) {
                return new ArrayList<>();
            }
            // }
             }
        }
        Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
        List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);

 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml

@@ -36,8 +36,8 @@
        jg.grid_name
        FROM
        jczz_property_company_district jpcd
        LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id  AND jd.is_deleted = 0
        LEFT JOIN jczz_property_company jpc ON jpc.id = jpcd.property_company_id  AND jpc.is_deleted = 0
        LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id AND jd.is_deleted = 0
        LEFT JOIN jczz_property_company jpc ON jpc.id = jpcd.property_company_id AND jpc.is_deleted = 0
        LEFT JOIN jczz_community jc on jc.`code`=jd.community_code
        LEFT JOIN blade_region br on br.code= jd.community_code
        LEFT JOIN jczz_grid_range jgr on jgr.district_code=jd.id
@@ -65,6 +65,9 @@
        <if test="propertyCompanyDistrict.propertyStage!=null">
            and jpcd.property_stage = #{propertyCompanyDistrict.propertyStage}
        </if>
        <if test="propertyCompanyDistrict.deptId!=null and propertyCompanyDistrict.deptId != ''">
            and jpc.dept_id = #{propertyCompanyDistrict.deptId}
        </if>
        <if test="propertyCompanyDistrict.principal!=null and propertyCompanyDistrict.principal!=''">
            and jpcd.principal like concat('%',#{propertyCompanyDistrict.principal},'%')
        </if>
@@ -83,18 +86,16 @@
    </select>

    <select id="getDistictUserByCode" resultType="org.springblade.modules.system.vo.UserVO">
         SELECT
            bu.*,
            jpc.name distictName
        FROM
            blade_user bu
                LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id
                LEFT JOIN jczz_property_company_district jpcd ON jpdu.property_company_district_id = jpcd.id
                LEFT JOIN jczz_property_company jpc on jpc.id = jpcd.property_company_id
                LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id
                LEFT JOIN jczz_doorplate_address jda ON jda.aoi_code = jd.aoi_code
        WHERE
            jda.address_code = #{houseCode} and bu.is_deleted = 0
        SELECT bu.*,
               jpc.name distictName
        FROM blade_user bu
                 LEFT JOIN jczz_property_district_user jpdu ON bu.id = jpdu.user_id
                 LEFT JOIN jczz_property_company_district jpcd ON jpdu.property_company_district_id = jpcd.id
                 LEFT JOIN jczz_property_company jpc on jpc.id = jpcd.property_company_id
                 LEFT JOIN jczz_district jd ON jd.id = jpcd.district_id
                 LEFT JOIN jczz_doorplate_address jda ON jda.aoi_code = jd.aoi_code
        WHERE jda.address_code = #{houseCode}
          and bu.is_deleted = 0
    </select>



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

@@ -48,6 +48,7 @@
        // 物业 查询用户管理的小区
        String userRole = AuthUtil.getUserRole();
        if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
            propertyCompanyDistrict.setDeptId(AuthUtil.getDeptId());
            // 查询小区id
            IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
            List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());

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

@@ -237,7 +237,7 @@
            IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
            PropertyCompanyEntity propertyCompanyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
            if (propertyCompanyEntity != null) {
                return baseMapper.getDetail(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
                return baseMapper.getDetailVO(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
            }
        }
        return null;

 src/main/java/org/springblade/modules/property/vo/PropertyCompanyDistrictVO.java

@@ -54,5 +54,8 @@

    private String gridName;

    // 机构
    private String deptId;


}