From 1ffbeb0506e57eed1120bb7455a3185c6fcfa206 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 13 Nov 2024 13:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gxwebsoft/common/system/entity/User.java     | 3 +++
 .../java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml | 3 +++
 src/main/java/com/gxwebsoft/common/system/param/UserParam.java | 3 +++
 3 files changed, 9 insertions(+)

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 @@
             <if test="param.isAdmin != null">
               AND a.is_admin = #{param.isAdmin}
             </if>
+            <if test="param.isOrganizationAdmin != null">
+              AND a.is_organization_admin = #{param.isOrganizationAdmin}
+            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>
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;