Merge branch 'dev' of https://github.com/roncoo/roncoo-education.git into dev

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseAuditBiz.java

@@ -93,14 +93,16 @@ public class BossCourseAuditBiz extends BaseBiz {
 	public Page<CourseAuditVO> listForPage(CourseAuditQO qo) {
 		CourseAuditExample example = new CourseAuditExample();
 		Criteria c = example.createCriteria();
-		c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode());
+
 		if (!StringUtils.isEmpty(qo.getCourseName())) {
 			c.andCourseNameLike(PageUtil.rightLike(qo.getCourseName()));
 		}
 		if (qo.getStatusId() != null) {
 			c.andStatusIdEqualTo(qo.getStatusId());
 		}
-		if (qo.getAuditStatus() != null) {
+		if (qo.getAuditStatus() == null) {
+			c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode());
+		} else {
 			c.andAuditStatusEqualTo(qo.getAuditStatus());
 		}
 		if (qo.getIsFree() != null) {
@@ -109,9 +111,7 @@ public class BossCourseAuditBiz extends BaseBiz {
 		if (qo.getIsPutaway() != null) {
 			c.andIsPutawayEqualTo(qo.getIsPutaway());
 		}
-		if (qo.getAuditStatus() != null) {
-			c.andAuditStatusEqualTo(qo.getAuditStatus());
-		}
+	
 		example.setOrderByClause(" status_id desc, is_putaway desc, sort desc, id desc ");
 		Page<CourseAudit> page = dao.listForPage(qo.getPageCurrent(), qo.getPageSize(), example);
 		Page<CourseAuditVO> CourseAuditVOList = PageUtil.transform(page, CourseAuditVO.class);

roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl

@@ -3,7 +3,7 @@
 	<form action="${base}/admin/sysRole/save" data-toggle="validate" method="post">
 		<div class="form-group">
             <label class="control-label x85">名称：</label>
-            <input type="text" name="roleName" value="" placeholder="名称" size="20">
+            <input type="text" name="roleName" value="" placeholder="名称" size="20" required="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/course/view.ftl

@@ -41,11 +41,11 @@
 			<div class="col-md-12">
                 <blockquote class="point">
                     <#list bean.courseChapterVOList! as chapter>
-                                                                    【${chapter_index+1}】 ${chapter.chapterName!} -【<#if chapter.isFree!?string == '1'>免费</#if><#if chapter.isFree!?string == '0'>${chapter.chapterOriginal!}元</#if>】
+                                                                    【${chapter_index+1}】 ${chapter.chapterName!}
                         <br/>
                         <br/>
                         <#list chapter.courseChapterPeriodVOList! as period>
-                        &nbsp;&nbsp;&nbsp;&nbsp;|--课时：${period.periodName!} -【<#if period.isFree! == 1>免费</#if><#if period.isFree! == 0>${period.periodOriginal!}元</#if>】
+                        &nbsp;&nbsp;&nbsp;&nbsp;|--课时：${period.periodName!}
                         <br/>
                         <br/>
                         </#list>

roncoo-education-web-boss/src/main/resources/templates/course/courseAudit/view.ftl

@@ -37,11 +37,11 @@
 			<div class="col-md-12">
                 <blockquote class="point">
                     <#list bean.courseChapterAuditList! as chapter>
-                                                                    【${chapter_index+1}】 ${chapter.chapterName!} -【<#if chapter.isFree!?string == '1'>免费</#if><#if chapter.isFree!?string == '0'>${chapter.chapterOriginal!}元</#if>】
+                                                                    【${chapter_index+1}】 ${chapter.chapterName!}
                         <br/>
                         <br/>
                         <#list chapter.courseChapterPeriodAuditList! as period>
-                        &nbsp;&nbsp;&nbsp;&nbsp;|--课时：${period.periodName!} -【<#if period.isFree! == 1>免费</#if><#if period.isFree! == 0>${period.periodOriginal!}元</#if>】
+                        &nbsp;&nbsp;&nbsp;&nbsp;|--课时：${period.periodName!}
                         <br/>
                         <br/>
                         </#list>

roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl

@@ -6,7 +6,7 @@
 		<input type="hidden" name="categoryType" value="${bean.categoryType}"/>
 		<div class="form-group">
             <label class="control-label x85">分类名称：</label>
-            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20">
+            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" required="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl

@@ -6,7 +6,7 @@
 		<input type="hidden" name="categoryType" value="${bean.categoryType}"/>
 		<div class="form-group">
             <label class="control-label x85">分类名称：</label>
-            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20">
+            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" required="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/edit.ftl

@@ -4,7 +4,7 @@
 		<input type="hidden" name="id" value="${bean.id}"/>
 		<div class="form-group">
             <label class="control-label x85">分类名称：</label>
-            <input type="text" name="categoryName" value="${bean.categoryName!}" placeholder="分类名称" size="20">
+            <input type="text" name="categoryName" value="${bean.categoryName!}" placeholder="分类名称" size="20" required="required">
         </div>
          <div class="form-group">
             <label class="control-label x85">排&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;序：</label>

roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl

@@ -4,7 +4,7 @@
 	<input type="hidden" name="parentId" value="${parentId}"/>
 		<div class="form-group">
             <label class="control-label x85">导航名称：</label>
-            <input type="text" name="navName" value="" placeholder="导航名称" size="20">
+            <input type="text" name="navName" value="" placeholder="导航名称" size="20" required="required">
         </div>
 	</form>
 </div>