Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/models/searchable/dependents/user.rb

@@ -17,6 +17,7 @@ module Searchable::Dependents::User
 
       # reindex subject
       created_subjects.each(&:reindex)
+      subjects.each(&:reindex)
     end
   end
 end

app/models/searchable/subject.rb

@@ -27,6 +27,7 @@ module Searchable::Subject
     {
       author_name: user.real_name,
       author_school_name: user.school_name,
+      member_user_names: users.map(&:real_name).join(' ')
     }
   end
 

app/services/concerns/elasticsearch_able.rb

@@ -29,6 +29,7 @@ module ElasticsearchAble
         subject_stages: { type: 'plain' },
         content: { type: 'plain' },
         descendants_contents: { type: 'plain' },
+        member_user_names: { type: 'plain' }
       }
     }
   end

public/react/config/webpack.config.prod.js

@@ -301,8 +301,8 @@ module.exports = {
         },
         warnings: false,
         compress: {
-          drop_debugger: false,
-          drop_console: false
+          drop_debugger: true,
+          drop_console: true
         }
       }
     }),

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

@@ -132,13 +132,14 @@ class ShixunWorkModal extends Component{
 
 	onChange=(e)=>{
 		let{group_list}=this.state;
-
 		let {data}=this.props;
 		if(e.target.checked===true){
 			if(data&&data.length===0){
 				let id=[]
 				group_list.forEach((item,key)=>{
+					if(item.works_count!=0){
 						id.push(item.id)
+					}
 				})
 				this.setState({
 					group_ids:id,
@@ -147,7 +148,9 @@ class ShixunWorkModal extends Component{
 			}else{
 				let id=[]
 				group_list.forEach((item,key)=>{
+					if(item.works_count!=0){
 						id.push(item.id)
+					}
 				})
 				this.setState({
 					group_ids:id,
@@ -161,6 +164,9 @@ class ShixunWorkModal extends Component{
 			})
 		}
 
+
+
+
 	}
 
 

public/react/src/search/SearchPage.js

@@ -247,7 +247,19 @@ class SearchPage extends Component{
 													})
 													}
 													</div>
-
+													<div>
+														{/*合作单位*/}
+														{item.content.member_user_names === undefined || item.content.member_user_names===0?"": item.content.member_user_names.map((item7, key7) => {
+															return (
+																<div className={"df"}>
+																	<span style={{flex: '0 0 82px'}}>合作单位：</span>
+																	<span className={key7>1?" tzbq ":" tzbqx"}
+																				dangerouslySetInnerHTML={{__html:item7}} />
+																</div>
+															)
+														})
+														}
+													</div>
 
 
 													<div className="mt20">