From f924586e776528106484849395ced125ad07c062 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 3 Nov 2023 14:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/harmonic/pojo/po/day/RStatLimitRateDPO.java   | 10 +++++-----
 .../com/njcn/user/service/impl/AppUserServiceImpl.java |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

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<AppUserMapper, User> impleme
 
     @Override
     public List<User> 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();
     }
 
     /**