diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index a3e5514..0a8ec58 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -189,6 +189,9 @@ public class User implements UserDetails {
@ApiModelProperty(value = "是否管理员")
private Boolean isAdmin;
+ @ApiModelProperty(value = "是否企业管理员")
+ private Integer isOrganizationAdmin;
+
@ApiModelProperty(value = "是否超级管理员")
@TableField(exist = false)
private Boolean isSuperAdmin;
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index 7b524a8..c76c359 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -119,6 +119,9 @@
AND a.is_admin = #{param.isAdmin}
+
+ AND a.is_organization_admin = #{param.isOrganizationAdmin}
+
AND a.deleted = #{param.deleted}
diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
index c75032f..42cae6e 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java
@@ -213,6 +213,9 @@ public class UserParam extends BaseParam {
@TableField(exist = false)
private Boolean isAdmin;
+ @ApiModelProperty(value = "是否企业管理员")
+ private Integer isOrganizationAdmin;
+
@ApiModelProperty("最后结算时间")
@TableField(exist = false)
private Date settlementTime;