Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -67,13 +67,24 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysRole" parameterType="map">
-        SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY update_time_ DESC
+        SELECT * FROM sys_role WHERE del_flag_ = 0
+        <where>
+        	<if test="search != null and search != ''">
+        		role_name_ like CONCAT('%',#{search},'%')
+        	</if>
+        </where>
+        ORDER BY update_time_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0
+        <where>
+        	<if test="search != null and search != ''">
+        		role_name_ like CONCAT('%',#{search},'%')
+        	</if>
+        </where>
 	</select>
 
     <select id="findRoleByUserId" resultMap="SysRole">

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -6,8 +6,6 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-
 /**
  * 对应数据库表(subject):
  */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/SubjectQueryInfo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.queryInfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 
 public class SubjectQueryInfo extends QueryInfo {
@@ -13,13 +12,13 @@ public class SubjectQueryInfo extends QueryInfo {
     private String queryType;
 
     @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
-    private YesOrNoEnum delFlag = YesOrNoEnum.NO;
+    private Boolean delFlag = false;
 
-    public YesOrNoEnum getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(YesOrNoEnum delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -101,6 +101,9 @@
             <if test="delFlag != null">
                 AND del_flag_ = #{delFlag}
             </if>
+            <if test="search != null and search != ''">
+                AND (id_ like concat('%',#{search},'%') or name_ like concat('%',#{search},'%'))
+            </if>
             <if test="queryType != null and queryType == 'category'">
             	and (parent_subject_id_ = 0 or parent_subject_id_ is null)
             </if>