会员拆分

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MemberRankSettingWrapper.java

@@ -52,6 +52,9 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("学生ID")
         private Integer studentId;
 
+        @ApiModelProperty("是否删除")
+        private Boolean delFlag = false;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

mec-biz/src/main/resources/config/mybatis/MemberRankSettingMapper.xml

@@ -75,10 +75,12 @@
 
 	<sql id="queryPageSql">
 		<where>
-            mrs.del_flag_ = 0
 			<if test="search != null and search != ''">
 				AND (mrs.name_ LIKE CONCAT('%',#{search},'%') OR mrs.id_ = #{search})
 			</if>
+            <if test="delFlag != null and delFlag == false">
+                AND mrs.del_flag_ = 0
+            </if>
             <if test="updateStartTime !=null">
                 AND mrs.update_time_ &gt;= #{updateStartTime}
             </if>