Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/tpm/TPMsettings/Configuration.js

@@ -66,7 +66,8 @@ export default class Shixuninformation extends Component {
       scope_partment: [],
       loading: false,
       opening_timetype:false,
-      use_scope_type:false
+      use_scope_type:false,
+      scope_partmenttype:false
     }
   }
 
@@ -150,6 +151,16 @@ export default class Shixuninformation extends Component {
         return
       }
     }
+    if(use_scope===1){
+      if(oldscope_partment.length===0){
+        this.setState({
+          scope_partmenttype:true
+        })
+        this.props.showNotification("请选择指定单位公开")
+        return
+      }
+    }
+
     let list=[]
     scope_partment.map((item,key)=>{
       list.push(item)
@@ -231,7 +242,8 @@ export default class Shixuninformation extends Component {
     if (scopetype === false) {
       datalist.push(e)
       this.setState({
-        scope_partment: datalist
+        scope_partment: datalist,
+        scope_partmenttype:false
       });
     } else {
       this.props.showNotification("请勿指定相同的单位")
@@ -297,7 +309,7 @@ export default class Shixuninformation extends Component {
     const dateFormat = 'YYYY-MM-DD HH:mm';
 
     // console.log()
-      console.log(this.props&&this.props.identity<8)
+
     return (
       <div>
         <div className="educontent mb200 edu-back-white padding10-20 pdb30 mb50">