Merge remote-tracking branch 'origin/master'

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java

@@ -99,6 +99,11 @@ public class StationEntity extends TenantEntity implements Serializable {
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Double waterLevelMax;
 
+	@ApiModelProperty("前池下限水位")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private Double downWaterLevel;
+
 	@ApiModelProperty("经度(东经)")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Float lgtd;

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

@@ -139,7 +139,7 @@ public class DeptServiceImpl implements IDeptService {
 	@Override
 	public List<Long> alarmDeptByCurrentUser() {
 		List<StationEntity> stations = stationService.list(Wrappers.<StationEntity>lambdaQuery()
-				.eq(StationEntity::getServeType, HomePageConstant.HYDROPOWER_SERVETYPE)
+				.eq(StationEntity::getType, HomePageConstant.HYDROPOWER)
 		);
 		if(CollectionUtil.isEmpty(stations)){
 			return new ArrayList<>();