Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -21,7 +21,6 @@ class ShixunWorkModal extends Component{
 				page:1,
 			}
 		}).then((response) => {
-			console.log(response);
 			if(response.data.group_list===undefined){
 				this.setState({
 					course_groups:response.data,
@@ -50,8 +49,22 @@ class ShixunWorkModal extends Component{
 
 	//勾选实训
 	shixunhomeworkedit=(checkedValues)=>{
+    let types=false
 		let{group_list}=this.state;
+		group_list.map((item,key)=>{
+			checkedValues.map((list,li)=>{
+				if(item.id===list){
+					if(item.works_count<2){
+						this.props.showNotification(`有效作品数少于2个，无法查重`)
+						types=true
+						return
+					}
+				}
+			})
 
+		})
+
+		if(types===false){
 			if(checkedValues.length===group_list.length){
 				this.setState({
 					onChangetype:true,
@@ -65,6 +78,8 @@ class ShixunWorkModal extends Component{
 			}
 		}
 
+	}
+
 	contentViewScroll=(e)=>{
 		//滑动到底判断
 		if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){