diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java index d92fa4c53..226f6eaf8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java @@ -44,31 +44,31 @@ public class RStatLimitRateDPO { private Integer allTime; /** - * 闪变总计算次数 + * 闪变越限次数 */ @TableField(value = "flicker_overtime") private Integer flickerOvertime; /** - * 频率偏差越限次数 + * 闪变总计算次数 */ @TableField(value = "flicker_all_time") private Integer flickerAllTime; /** - * 电压偏差越限次数 + * 频率偏差越限次数 */ @TableField(value = "freq_dev_overtime") private Integer freqDevOvertime; /** - * 电压不平衡度越限次数 + * 电压偏差越限次数 */ @TableField(value = "voltage_dev_overtime") private Integer voltageDevOvertime; /** - * 闪变越限次数 + * 三相电压不平衡度越限次数 */ @TableField(value = "ubalance_overtime") private Integer ubalanceOvertime; diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java index 0f5015889..03a230677 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java @@ -257,7 +257,8 @@ public class AppUserServiceImpl extends ServiceImpl impleme @Override public List getAdminInfo() { - return this.lambdaQuery().eq(User::getLoginName,"njcnyw").eq(User::getState,1).list(); + //这边先排除掉dev_code不存在的业务管理员 + return this.lambdaQuery().eq(User::getType,1).eq(User::getState,1).ne(User::getDevCode,"").list(); } /**