|  | @@ -5,7 +5,6 @@
 | 
											
												
													
														|  |  不要修改此文件。所有改动将在下次重新自动生成时丢失。
 |  |  不要修改此文件。所有改动将在下次重新自动生成时丢失。
 | 
											
												
													
														|  |  -->
 |  |  -->
 | 
											
												
													
														|  |  <mapper namespace="com.yonge.cooleshow.biz.dal.dao.SubjectDao">
 |  |  <mapper namespace="com.yonge.cooleshow.biz.dal.dao.SubjectDao">
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |      <resultMap type="com.yonge.cooleshow.biz.dal.entity.Subject" id="Subject">
 |  |      <resultMap type="com.yonge.cooleshow.biz.dal.entity.Subject" id="Subject">
 | 
											
												
													
														|  |          <result column="id_" property="id"/>
 |  |          <result column="id_" property="id"/>
 | 
											
												
													
														|  |          <result column="name_" property="name"/>
 |  |          <result column="name_" property="name"/>
 | 
											
										
											
												
													
														|  | @@ -40,7 +39,7 @@
 | 
											
												
													
														|  |          UPDATE subject
 |  |          UPDATE subject
 | 
											
												
													
														|  |          <set>
 |  |          <set>
 | 
											
												
													
														|  |              <if test="delFlag != null">
 |  |              <if test="delFlag != null">
 | 
											
												
													
														|  | -                del_flag_ = #{delFlag,typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},
 |  | 
 | 
											
												
													
														|  | 
 |  | +                del_flag_ = #{delFlag},
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="parentSubjectId != null">
 |  |              <if test="parentSubjectId != null">
 | 
											
												
													
														|  |                  parent_subject_id_ = #{parentSubjectId},
 |  |                  parent_subject_id_ = #{parentSubjectId},
 | 
											
										
											
												
													
														|  | @@ -89,7 +88,7 @@
 | 
											
												
													
														|  |                  AND parent_subject_id_ = #{parentId}
 |  |                  AND parent_subject_id_ = #{parentId}
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="delFlag != null">
 |  |              <if test="delFlag != null">
 | 
											
												
													
														|  | -                AND del_flag_ = #{delFlag,typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
 |  | 
 | 
											
												
													
														|  | 
 |  | +                AND del_flag_ = #{delFlag}
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |          </where>
 |  |          </where>
 | 
											
												
													
														|  |      </select>
 |  |      </select>
 | 
											
										
											
												
													
														|  | @@ -104,7 +103,7 @@
 | 
											
												
													
														|  |                  AND parent_subject_id_ = #{parentId}
 |  |                  AND parent_subject_id_ = #{parentId}
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="delFlag != null">
 |  |              <if test="delFlag != null">
 | 
											
												
													
														|  | -                AND del_flag_ = #{delFlag,typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler}
 |  | 
 | 
											
												
													
														|  | 
 |  | +                AND del_flag_ = #{delFlag}
 | 
											
												
													
														|  |              </if>
 |  |              </if>
 | 
											
												
													
														|  |              <if test="queryType != null and queryType == 'category'">
 |  |              <if test="queryType != null and queryType == 'category'">
 | 
											
												
													
														|  |              	and (parent_subject_id_ = 0 or parent_subject_id_ is null)
 |  |              	and (parent_subject_id_ = 0 or parent_subject_id_ is null)
 |