Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java

@@ -1003,12 +1003,10 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 	@Override
 	public List<EmInfoEntity> select(Long deptId) {
 		if(ObjectUtil.isEmpty(deptId)){
-			return this.list(Wrappers.<EmInfoEntity>lambdaQuery()
-					.in(EmInfoEntity::getEmType, "2"));
+			return this.list();
 		}
 		return this.list(Wrappers.<EmInfoEntity>lambdaQuery()
-				.eq(EmInfoEntity::getDepartment,deptId)
-				.eq(EmInfoEntity::getEmType, "2")
+				.like(EmInfoEntity::getDepartment,deptId)
 		);
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java

@@ -1061,15 +1061,12 @@ public class WaterServiceImpl implements IWaterService {
 		if(MapUtils.isEmpty(rainMap)){
 			return new ArrayList<>();
 		}
-		R<List<Dept>> depts = sysClient.getDeptChild(deptId);
-		if (!depts.isSuccess() || ObjectUtil.isEmpty(depts.getData())) {
+		R<List<Dept>> R = sysClient.getDeptByCurrentUser();
+		if (!R.isSuccess() || ObjectUtil.isEmpty(R.getData())) {
 			return new ArrayList<>();
 		}
 		// 获取水利站点
-		List<StationEntity> stations = stationService.list(Wrappers.<StationEntity>lambdaQuery()
-				.in(StationEntity::getRefDept,depts.getData().stream().map(Dept::getId).collect(Collectors.toList()))
-				.in(StationEntity::getType,HomePageConstant.waterList)
-				.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE));
+		List<StationEntity> stations = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false);
 		if(CollectionUtil.isEmpty(stations)){
 			return new ArrayList<>();
 		}