diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 374bf9c..e55bb9b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -35,9 +35,9 @@
 			</div>
 			<div class="head_box_r">
 				<select name="status" id="status" style="width:90px;height:26px;margin-right:5px;padding:0;border-color:#aaa;">
-					<option value="0">全部</option>
-					<option value="1">完成</option>
-					<option value="2">未完成</option>
+					<option value="">全部</option>
+					<option value="0" <c:if test="${pd.STATUS=='0'}">selected="true"</c:if>>未完成</option>
+					<option value="1" <c:if test="${pd.STATUS=='1'}">selected="true"</c:if>>完成</option>
 				</select>
 				<input class="date-picker" type="text" placeholder="开始日期" name="StartDate" id="StartDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.STARTDATE }"/> 
 				<input type="text" class="date-picker" placeholder="结束日期" name="EndDate" name="EndDate" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.ENDDATE}"/>
@@ -188,28 +188,34 @@
 	function del(Id){
 		window.top.remove.init({"title":"删除","func":function(success){
 			if(success){
-				var str = '';
-				for(var i=0;i < document.getElementsByName('ids').length;i++){
-				  if(document.getElementsByName('ids')[i].checked){
-				  	if(str=='') str += document.getElementsByName('ids')[i].value;
-				  	else str += ',' + document.getElementsByName('ids')[i].value;
-				  }
+				var str = Id;
+				if(typeof(Id) == "undefined"){
+					str = '';
 				}
-				if(str==''){
-					
-				}else{
-					$.ajax({
-							type: "POST",
-							url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),
-					    	data: {DATA_IDS:str},
-							dataType:'json',
-							//beforeSend: validateData,
-							cache: false,
-							success: function(data){
-								tosearch();
-							}
-						});
+				if(str == ''){
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+				}
+				if(str == ''){
+					return ;
 				}
+				
+				$.ajax({
+						type: "POST",
+						url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),
+				    	data: {DATA_IDS:str},
+						dataType:'json',
+						//beforeSend: validateData,
+						cache: false,
+						success: function(data){
+							tosearch();
+						}
+					});
+				
 			}
 			else{
 				console.log("false");
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 514a8c7..b65cf66 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -168,6 +168,16 @@
 			CODE = #{CODE}
 	</select>
 	
+	
+	<select id="querySubjectId" parameterType="pd" resultType="pd">
+		select 
+		SUBJECT_ID 
+		from 
+		sv_coursemanagement 
+		where TEACHER_ID = #{TEACHER_ID} 
+		GROUP BY SUBJECT_ID
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
@@ -199,8 +209,12 @@
 		<if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &lt; #{pd.ENDDATE}
 		</if>
+		<if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 -->
+			and COMPLETE_COUNT = #{pd.STATUS}
+		</if>
 		
 		and IS_DELETE is  null
+		ORDER BY COMPLETE_DATE DESC
 	</select>
 	
 	<!-- 列表(全部) -->
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 5ade7c0..7857a30 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -167,6 +167,9 @@ public class HomeworkController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		// 添加科目ID
+		pd.put("TEACHER_ID", getTeacherID());
+		pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
 		mv.setViewName("sunvote/homework/homework_edit2");
 		mv.addObject("msg", "save");
 		mv.addObject("operation", "add");
@@ -174,7 +177,7 @@ public class HomeworkController extends BaseController {
 		return mv;
 	}
 
-	/**
+	/**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     
 	 * 去修改页面
 	 * 
 	 * @param
@@ -537,9 +540,6 @@ public class HomeworkController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
-			return null;
-		} // 校验权限
 		PageData pd = new PageData();
 		Map<String, Object> map = new HashMap<String, Object>();
 		pd = this.getPageData();
@@ -691,6 +691,12 @@ public class HomeworkController extends BaseController {
 		if (homework != null) {
 			hpd.put("CODE", get32UUID());
 			hpd.put("NAME", homework.getNAME());
+			if(homework.getSUBJECT_ID() == null){
+				List<PageData> slist = homeworkService.querySubjectId(pd);
+				if(slist.size() > 0){
+					homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
+				}
+			}
 			hpd.put("SUBJECT_ID", homework.getSUBJECT_ID());
 			hpd.put("ALL_SCORE", homework.getALL_SCORE());
 			hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC());
diff --git a/src/com/fh/service/sunvote/homework/HomeworkManager.java b/src/com/fh/service/sunvote/homework/HomeworkManager.java
index 0427593..1a7948e 100644
--- a/src/com/fh/service/sunvote/homework/HomeworkManager.java
+++ b/src/com/fh/service/sunvote/homework/HomeworkManager.java
@@ -55,6 +55,11 @@ public interface HomeworkManager{
 	 * @param pd
 	 * @throws Exception
 	 */
+	public List<PageData> querySubjectId(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
 	public List<PageData> report(PageData pd)throws Exception;
 	/**列表(全部)
 	 * @param pd
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
index e6792ad..0932372 100644
--- a/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -60,7 +60,7 @@ public class HomeworkService implements HomeworkManager{
 	 * @throws Exception
 	 */
 	public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception{
-		dao.update("HomeworkMapper.deleteHomework", ArrayDATA_IDS);
+		dao.update("HomeworkMapper.deleteHomeworkAll", ArrayDATA_IDS);
 	}
 	
 	/**列表
@@ -115,6 +115,11 @@ public class HomeworkService implements HomeworkManager{
 	public List<PageData> report(PageData pd) throws Exception {
 		return (List<PageData>)dao.findForList("HomeworkMapper.report", pd);
 	}
+
+	@Override
+	public List<PageData> querySubjectId(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("HomeworkMapper.querySubjectId", pd);
+	}
 	
 }