Merge remote-tracking branch 'origin/master'

src/main/java/com/ssj/dao/sys/homework/dao/impl/HomeworkPictureQueryDaoImpl.java

@@ -172,10 +172,10 @@ public class HomeworkPictureQueryDaoImpl  implements  HomeworkPictureQueryDao {
 				.append(" hp.teacher_id, hp.allot_time,  hp.create_time, hp.corrected_picture_url, hpc.check_date, hpc.checker, hpc.is_check_error," )
 				.append(" hpc.error_reason, hp.is_checker_correct is_correct")
 				.append(" FROM scon_homework_picture hp left join scon_homework_picture_correct hpc on hp.id=hpc.homework_picture_id ")
-				.append(" where hp.homework_id=? and hpc.type = ? and (hp.is_feedback=1 or hp.is_mark in (1,3,4)) order by hp.create_time");
+				.append(" where hp.homework_id=? AND hp.correct_time is NOT NULL and hpc.type = ? and (hp.is_feedback=1 or hp.is_mark in (1,3,4)) order by hp.create_time");
 		param.add(homeworkId);
 		param.add(type);
-		return dao.findList(sb.toString(), param.toArray(), HomeworkPictureDto.class);
+		return dao.findList(sb.toString(), param.toArray(), HomeworkPictureDto.class); 
 	}
 
 	@Override

src/main/resources/templates/sys/fx/merchantAdd.html

@@ -163,7 +163,7 @@ dtext{
 				<input type="text"  class="dfinput fl"  id="computeTime" name="computeTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" autocomplete="off" th:value="${#dates.format(merchant.computeTime, 'yyyy-MM-dd')}" placeholder="计费开始日期">
 			</li>
 			
-			<li th:style="${ #httpSession.getAttribute('admin') !=null && #lists.contains(#httpSession.getAttribute('admin').authorities,'超级管理员角色')  ? ''   : 'display: none' }">
+			<li >
 				<label>上级渠道：<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" > 

src/main/resources/templates/sys/fx/merchantScAdd.html

@@ -138,7 +138,7 @@ dtext{
 			</li>
 			
 			
-			<li style="display: none">
+			<li>
 				<label>上级渠道：<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" >