update

liujie

2 天以前 9833884154d78f47e195c04e73cf098e3fb17fa7

update

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java

@@ -428,7 +428,7 @@
        ArrayList<RegionVO> regionVOS = new ArrayList<>();

        regionVOS.add(new RegionVO("1","市",new ArrayList<>(),1));
        List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getDeleteFlag, 0));
        List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getDeleteFlag, 0).eq(BcRegion::getParentId,  510400));
        ArrayList<RegionVO> regionList = new ArrayList<>();
        list.forEach(e->{
            RegionVO regionVO = new RegionVO();

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/ComplaintMapper.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
import com.panzhihua.sangeshenbian.model.query.ComplaintQuery;
import com.panzhihua.sangeshenbian.model.vo.AppComplaintRejectVO;
import com.panzhihua.sangeshenbian.model.vo.ComplaintTodoVO;
@@ -104,5 +105,5 @@
    Page<AppComplaintRejectVO> queryRejectRecordPage(Page<ComplaintVO> page, @Param("keyword") String keyword,
                                                     @Param("accountLevel") Integer accountLevel, @Param("targetId") Long targetId);

    List<Complaint> queryCompliantList(Long targetId, Integer accountLevel, LoginUserInfoVO loginUserInfo);
    List<Complaint> queryCompliantList(@Param("targetId") Long targetId, @Param("accountLevel") Integer accountLevel, @Param("loginUserInfo") LoginUserInfoVO loginUserInfo,  @Param("query")AppStaticsQuery query);
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUserLevel.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,6 +55,7 @@
    private String community;

    @ApiModelProperty(value = "社区ID")
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long communityId;

    @ApiModelProperty(value = "是否纪检组监督账号 1：是；0：否")

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java

@@ -1673,7 +1673,7 @@
            targetId = partyMember.getId();
        } else if (identity.equals(2)) {
            //上级
            if (Objects.nonNull(query.getTier()) && !query.getTier().equals(-1)) {
            if (Objects.nonNull(query.getTier()) && query.getTier().equals(-1)) {
                accountLevel = systemUserLevel.getLevel();
                switch (systemUserLevel.getLevel()) {
                    case 1:
@@ -1698,7 +1698,7 @@
                accountLevel = query.getTier();
            }
        }
        return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo);
        return baseMapper.queryCompliantList(targetId, accountLevel, loginUserInfo,query);
    }
}


 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java

@@ -94,7 +94,7 @@
    private List<RegionVO> buildDistrictLevelTree(String districtCode) {
        List<RegionVO> streets = systemUserMapper.getStreet(districtCode);
        streets.forEach(street -> {
            street.setTier(2);
            street.setTier(3);
            List<RegionVO> communities = systemUserMapper.getCommunity(street.getId());
            communities.forEach(c -> c.setTier(4));
            street.setChildren(communities);