From c7608e7f153ba70d2392f17754d1c384a38ce1ec Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Tue, 14 Jan 2025 13:23:11 +0800
Subject: [PATCH] quanxian

---
 src/main/java/com/example/demo/domain/entity/Admin.java | 1 +
 src/main/java/com/example/demo/mapper/AdminMapper.java  | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/Admin.java b/src/main/java/com/example/demo/domain/entity/Admin.java
index e072ba2..7c595b9 100644
--- a/src/main/java/com/example/demo/domain/entity/Admin.java
+++ b/src/main/java/com/example/demo/domain/entity/Admin.java
@@ -99,6 +99,7 @@ public class Admin implements UserDetails, Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String jwcode;
+    private Integer status;
 
 
     @Override
diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java
index c9fb394..964dc67 100644
--- a/src/main/java/com/example/demo/mapper/AdminMapper.java
+++ b/src/main/java/com/example/demo/mapper/AdminMapper.java
@@ -11,9 +11,9 @@ import java.util.List;
 public interface AdminMapper {
     @Insert({
             "insert into admin",
-            "(name,jwcode,password,permission,area,admin_flag,create_time,remark)",
+            "(name,jwcode,password,permission,area,admin_flag,create_time,remark,status)",
             "values",
-            "(#{name},#{jwcode},,#{password},#{permission},#{area},#{admin_flag},now(),#{remark})"
+            "(#{name},#{jwcode},,#{password},#{permission},#{area},#{admin_flag},now(),#{remark},#{status})"
     })
     @Options(useGeneratedKeys = true,keyColumn = "admin_id",keyProperty = "adminId")
     int insert(Admin admin);
@@ -27,6 +27,7 @@ public interface AdminMapper {
             "<if test='permission!=null and permission.length()>0'>permission =#{permission},</if>",
             "<if test='area!=null and area.length()>0'>area =#{area},</if>",
             "<if test='adminFlag!=null '>admin_flag =#{adminFlag},</if>",
+            "<if test='status!=null '>status =#{status},</if>",
             "</set>",
             "where jwcode =#{jwcode}",
             "</script>"
@@ -46,12 +47,12 @@ public interface AdminMapper {
             "<script>",
             "SELECT * from admin",
             "<where>",
-            "permission is not null and admin_flag=1",
+            "admin_flag=1",
             "<if test='name!=null and name.length()>0'> and `name` like concat('%',#{name},'%')</if>",
             "<if test='jwcode!=null and jwcode.length()>0'> and jwcode=#{jwcode}</if>",
-            "<if test='permission!=null'> and permission=#{permission}</if>",
             "<if test='area!=null and area.length()>0'> and `area`=#{area}</if>",
             "<if test='store!=null and store.length()>0'> and `store`=#{store}</if>",
+            "and permission != 4",
             "</where>",
             "ORDER BY permission ASC",
             "</script>"