From 84bcbd47a329f93b7a8a18c78be35cfcbf845219 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 4 Jan 2023 18:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/bms/entity/BmsMasterUser.java    | 11 +++++++++++
 .../bms/service/impl/BmsMasterUserServiceImpl.java    |  1 -
 src/main/resources/banner.txt                         |  2 +-
 src/main/resources/mapper/bms/BmsMasterUserMapper.xml |  4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java
index a48f885c..019acf81 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsMasterUser.java
@@ -102,5 +102,16 @@ public class BmsMasterUser implements Serializable {
     @TableField(exist = false)
     private Object objectInfo;
 
+    @TableField(exist = false)
+    private String centerName;
+
+    @TableField(exist = false)
+    private String centerCode;
+
+    @TableField(exist = false)
+    private String userName;
+
+    @TableField(exist = false)
+    private String userCode;
 }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java
index 109b4e5e..5d0b514e 100644
--- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsMasterUserServiceImpl.java
@@ -35,7 +35,6 @@ public class BmsMasterUserServiceImpl extends ServiceImpl<BmsMasterUserMapper,Bm
         LambdaQueryWrapper<BmsMasterUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(BmsMasterUser::getTargetId,masterUser.getTargetId());
         lqw.eq(BmsMasterUser::getType,masterUser.getType());
-        lqw.ne(BmsMasterUser::getUserId,masterUser.getUserId());
         BmsMasterUser param = new BmsMasterUser();
         param.setMasterFlag(0);
         this.update(param,lqw);
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index 1b302049..09bf7ffd 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -1,4 +1,4 @@
 ${AnsiBackground.BLACK}
 -- ----------------------------
--- 问卷系统 by.柒胜
+-- 嘉士利CRM系统 by.柒胜
 -- ----------------------------
diff --git a/src/main/resources/mapper/bms/BmsMasterUserMapper.xml b/src/main/resources/mapper/bms/BmsMasterUserMapper.xml
index d988f6ea..89b4535f 100644
--- a/src/main/resources/mapper/bms/BmsMasterUserMapper.xml
+++ b/src/main/resources/mapper/bms/BmsMasterUserMapper.xml
@@ -145,6 +145,10 @@
         <where>
             and `bms_master_user`.`type` = 'center'
             <include refid="whereMasterUserBaseCondition"></include>
+            <if test="query.userCode != null and query.userCode != ''"> and `sys_user`.`code` LIKE CONCAT('%',#{query.userCode},'%') </if>
+            <if test="query.userName != null and query.userName != ''"> and `sys_user`.`name` LIKE CONCAT('%',#{query.userName},'%') </if>
+            <if test="query.centerName != null and query.centerName != ''"> and `bms_cost_center`.`name` LIKE CONCAT('%',#{query.centerName},'%') </if>
+            <if test="query.centerCode != null and query.centerCode != ''"> and `bms_cost_center`.`code` LIKE CONCAT('%',#{query.centerCode},'%') </if>
             and `bms_master_user`.`del_flag` = '0'
             and `sys_user`.`del_flag` = '0'
             and `bms_cost_center`.`del_flag` = '0'