修改查询课程分类

src/main/java/org/rcisoft/business/bcourse/dao/BCourseRepository.java

@@ -7,7 +7,6 @@ import org.rcisoft.business.bcourse.entity.BCourse;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +24,7 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
     @ResultMap(value = "ChildListResultMap")
     List<QueryCourseResDTO> queryCourses(Map<String, Object> param);
 
-    @Select("select *from b_course where pid = #{pid} ORDER BY sort")
+    @Select("select *from b_course where del_flag != 1 and pid = #{pid} ORDER BY sort")
     @ResultMap(value = "ChildListResultMap")
     List<QueryCourseResDTO> queryCoursesByPid(String parentId);
 

src/main/java/org/rcisoft/core/entity/DataEntity.java

 package org.rcisoft.core.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.rcisoft.core.anno.OperateFlagAnno;
 import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.constant.FlagStatus;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.MappedSuperclass;
 import java.io.Serializable;
@@ -28,12 +30,16 @@ public abstract class DataEntity<T>  implements Serializable {
 
     protected String remarks;	// 备注
     protected String createBy;	// 创建者
+    @DateTimeFormat(pattern="yyyy/MM/dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy/MM/dd HH:mm:ss")
     protected Date createDate;// 创建日期
 
     @OperateFlagAnno
     protected String updateBy;	// 更新者
 
     @OperateFlagAnno(jdbcTypeName = "TIMESTAMP")
+    @DateTimeFormat(pattern="yyyy/MM/dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy/MM/dd HH:mm:ss")
     protected Date updateDate;// 更新日期
 
     @OperateFlagAnno