|
|
@ -2,10 +2,8 @@ package com.hnac.hzims.operational.station.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.hnac.hzims.common.service.UserAuthDataService; |
|
|
|
|
|
|
|
import com.hnac.hzims.fdp.feign.IQuestionClient; |
|
|
|
import com.hnac.hzims.fdp.feign.IQuestionClient; |
|
|
|
import com.hnac.hzims.operational.OperationalConstants; |
|
|
|
import com.hnac.hzims.operational.OperationalConstants; |
|
|
|
import com.hnac.hzims.operational.main.constant.HomePageConstant; |
|
|
|
import com.hnac.hzims.operational.main.constant.HomePageConstant; |
|
|
@ -64,7 +62,6 @@ import java.util.stream.Collectors; |
|
|
|
public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEntity> implements IStationService { |
|
|
|
public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEntity> implements IStationService { |
|
|
|
private final ISysClient sysClient; |
|
|
|
private final ISysClient sysClient; |
|
|
|
private final IDeptClient deptClient; |
|
|
|
private final IDeptClient deptClient; |
|
|
|
private final UserAuthDataService userAuthDataService; |
|
|
|
|
|
|
|
private final IUserClient userClient; |
|
|
|
private final IUserClient userClient; |
|
|
|
private final ProjectClient projectClient; |
|
|
|
private final ProjectClient projectClient; |
|
|
|
private final BladeLogger logger; |
|
|
|
private final BladeLogger logger; |
|
|
@ -531,7 +528,7 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn |
|
|
|
// 传入机构为区域、省子公司、集团
|
|
|
|
// 传入机构为区域、省子公司、集团
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 递归权限机构获取站点级机构
|
|
|
|
// 递归权限机构获取站点级机构
|
|
|
|
refDepList = this.getStationDeptList(authList, dept.getId(), new ArrayList<>()); |
|
|
|
refDepList = this.getStationDeptList(authList, types,dept.getId(), new ArrayList<>()); |
|
|
|
} |
|
|
|
} |
|
|
|
// 获取水利站点(过滤其他站点类型)
|
|
|
|
// 获取水利站点(过滤其他站点类型)
|
|
|
|
return this.getWaterList(refDepList, types, servrType,make); |
|
|
|
return this.getWaterList(refDepList, types, servrType,make); |
|
|
|