update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Subject.java

@@ -31,7 +31,7 @@ public class Subject {
 	private java.util.Date updateTime;
 
 	@ApiModelProperty(value = "是否删除",required = false)
-	private YesOrNoEnum delFlag;
+	private Boolean delFlag;
 
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
@@ -118,11 +118,11 @@ public class Subject {
 		return this.updateTime;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/SubjectServiceImpl.java

@@ -38,7 +38,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
 
     @Override
     public void upSetSubject(Subject subject) {
-        if(subject.getDelFlag() == YesOrNoEnum.YES){
+        if(subject.getDelFlag() != null && subject.getDelFlag() == true){
             subjectDao.delete(subject.getId());
             return;
         }

edu-user/edu-user-server/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -14,7 +14,7 @@
         <result column="img_" property="img"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
@@ -40,7 +40,7 @@
         UPDATE subject
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+                del_flag_ = #{delFlag},
             </if>
             <if test="parentSubjectId != null">
                 parent_subject_id_ = #{parentSubjectId},
@@ -115,7 +115,7 @@
                 AND tenant_id_ = #{tenantId}
             </if>
             <if test="delFlag != null">
-                AND del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+                AND del_flag_ = #{delFlag}
             </if>
         </where>
     </sql>