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 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 @@ and `bms_master_user`.`type` = 'center' + and `sys_user`.`code` LIKE CONCAT('%',#{query.userCode},'%') + and `sys_user`.`name` LIKE CONCAT('%',#{query.userName},'%') + and `bms_cost_center`.`name` LIKE CONCAT('%',#{query.centerName},'%') + and `bms_cost_center`.`code` LIKE CONCAT('%',#{query.centerCode},'%') and `bms_master_user`.`del_flag` = '0' and `sys_user`.`del_flag` = '0' and `bms_cost_center`.`del_flag` = '0'