Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/oa/service/impl/UserServiceImpl.java

@@ -19,7 +19,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User>
     public int getCount(User user) {
         return this.baseMapper.selectCount(new QueryWrapper<User>()
                 .eq("unitId", user.getUnitid())
-                .eq("USER_STATE", user.getUserState()));
+                .eq("USER_STATE", user.getUserState())
+                .notIn("UNIVERSALID", new String[] {
+                        "347517210967865", // 单位管理员
+                        "284381380647600", // 何茂雄
+                        "284381382211000", // 何茂鸿
+                        "284381384120700" // 林明东
+                }));
     }
 }