token获取物业id处理

张天森

2022-11-14 b1fc2df27e776b52204abd6707660b90c48ab820

token获取物业id处理

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -1008,7 +1008,12 @@
            }
        }
        log.info("当前userType===="+comEvent.getUserType());
        comEvent.setAppId(loginUserInfoVO.getAppId());
        //comEvent.setAppId(loginUserInfoVO.getAppId());
        R<LoginUserInfoVO> r = userService.detailUser(loginUserInfoVO.getUserId());
        LoginUserInfoVO user = r.getData();
        if (nonNull(user.getAppId())){
            comEvent.setAppId(user.getAppId());
        }
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dao/ComPropertyRepairDao.java

@@ -21,5 +21,6 @@
@Mapper
public interface ComPropertyRepairDao extends BaseMapper<ComPropertyRepair> {
    IPage<ComPropertyRepairVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
    IPage<ComPropertyRepairVO> pageList2(Page page, @Param("commonPage") CommonPage commonPage);
    ComPropertyRepairVO selectDetail(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java

@@ -33,8 +33,13 @@

    @Override
    public R pageList(CommonPage commonPage) {
        IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
        return R.ok(list);
        if (nonNull(commonPage.getPropertyCheck()) && nonNull(commonPage.getPropertyId())){
            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList2(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
            return R.ok(list);
        }else{
            IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
            return R.ok(list);
        }
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyRepairMapper.xml

@@ -67,5 +67,43 @@
    <select id="selectDetail" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO">
        select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id where t.id=#{id}
    </select>

    <select id="pageList2" resultType="com.panzhihua.common.model.vos.property.ComPropertyRepairVO">
    select t.*,t1.name as feedback from com_property_repair t left join sys_user t1 on t.feedback_by = t1.user_id left join com_property t2 on t.property_id = t2.area_id left join com_mng_village t3 on t.property_id=t3.village_id
    <where>
        1=1
        <if test="commonPage.status !=null">
            and t.repair_status =#{commonPage.status}
        </if>
        <if test="commonPage.username !=null and commonPage.username.trim() !=''">
            and t.repair_name  like concat(#{commonPage.username},'%')
        </if>
        <if test="commonPage.phone !=null and commonPage.phone.trim() !=''">
            and t.repair_phone like concat(#{commonPage.phone},'%')
        </if>
        <if test="commonPage.address !=null and commonPage.address.trim() !=''">
            and t.repair_position like  concat(#{commonPage.address},'%')
        </if>
        <if test="commonPage.beginTime !=null">
            and t.create_time >=#{commonPage.beginTime}
        </if>
        <if test="commonPage.endTime !=null">
            and #{commonPage.endTime} >=t.create_time
        </if>
        <if test="commonPage.systemName !=null and commonPage.systemName.trim() !=''">
            and t1.name like concat(#{commonPage.systemName},'%')
        </if>
        <if test="commonPage.paramId !=null and commonPage.paramId !=0">
            and t2.community_id = ${commonPage.paramId}
        </if>
        <if test="commonPage.areaId !=null and commonPage.areaId !=0">
            and t2.area_id =#{commonPage.areaId}
        </if>
        <if test="commonPage.userId !=null">
            and t.create_by =#{commonPage.userId}
        </if>
        <if test="commonPage.propertyId != null and commonPage.propertyId != ''">
            AND t.property_id=#{commonPage.propertyId}
        </if>
    </where>
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1385,9 +1385,6 @@
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        if (administratorsUserVO.getCommunityId().equals(10172)){
            roleDO.setRoleId(1559112102373756548L);
        }
        sysUserDO.setAppId(appId);
        int insert = 0;
        try {
@@ -1411,6 +1408,9 @@
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setUserId(userId);
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            if (administratorsUserVO.getCommunityId().equals(10172)){
                sysUserRoleDO.setRoleId(1559112102373756548L);
            }
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1 > 0) {
                return R.ok(userId);