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

app/forms/competitions/save_team_form.rb

@@ -16,14 +16,13 @@ class Competitions::SaveTeamForm
   validate :check_teachers_enrollable
   def check_teachers_enrollable
     if competition.teacher_enroll_forbidden? # 禁止老师报名
+      return if creator.is_teacher? # 因为创建者有单独校验，所以这里跳过
       return if teacher_ids.blank?
 
       if teacher_ids.present?
         errors.add(:teacher_ids, :enroll_forbidden)
         return
       end
-
-      return if creator.is_teacher? # 因为创建者有单独校验，所以这里跳过
     end
 
     self.teacher_ids = teacher_ids.map(&:to_i)
@@ -50,14 +49,13 @@ class Competitions::SaveTeamForm
   validate :check_members_enrollable
   def check_members_enrollable
     if competition.member_enroll_forbidden? # 禁止学生报名
+      return unless creator.is_teacher? # 因为创建者有单独校验，所以这里跳过
       return if member_ids.blank?
 
       if member_ids.present?
         errors.add(:member_ids, :enroll_forbidden)
         return
       end
-
-      return unless creator.is_teacher? # 因为创建者有单独校验，所以这里跳过
     end
 
     self.member_ids = member_ids.map(&:to_i)

public/react/src/modules/competition/competmodal/PersonModal.js

@@ -104,11 +104,19 @@ class PersonModal extends Component {
 		this.setState({
 			myuser: this.props.user,
 			mydatas: data,
-			polls_nametest: polls_nametests
+			polls_nametest: polls_nametests,
+
 		})
 		this.setState({
 			GetenrollmentAPI: this.props.GetenrollmentAPI,
 		})
+		try {
+			this.setState({
+				addonAfter: polls_nametests.length,
+			})
+		} catch (e) {
+
+		}
 
 	}
 
@@ -148,7 +156,6 @@ class PersonModal extends Component {
 	};
 	//创建战队
 	Createateam = () => {
-		debugger
 		try {
 			if (this.state.polls_nametest.length === 0) {
 				this.props.showNotification(`请输入您的战队名称，最多不超过60个字符`);
@@ -862,6 +869,10 @@ class PersonModal extends Component {
 			member_ids, mydatas, booltech, boolstud, GetenrollmentAPI, Thecurrentnumberbool,
 			Thecurrentnumberboolstu, Thecurrentnumberstu
 		} = this.state;
+		const {
+			teacher_staff,
+			member_staff
+		} = this.props;
 		//Modal
 		//keyboard是否支持键盘 esc 关闭
 		//closable    是否显示右上角的关闭按钮
@@ -1291,6 +1302,11 @@ class PersonModal extends Component {
 
 
 					{/*导师*/}
+					{
+						teacher_staff === undefined || teacher_staff === null ?
+							"" :
+
+							<div>
 								<div style={{
 									display: "flex",
 									flexDirection: "initial",
@@ -1318,6 +1334,7 @@ class PersonModal extends Component {
 										}
 									</style>
 									{/*<div className={"yslzxueshiskmcd2"}>*/}
+
 									<Dropdown overlay={cpersondiv1} getPopupContainer={trigger => trigger.parentNode}
 														visible={this.state.person1}>
 										<Input
@@ -1342,9 +1359,17 @@ class PersonModal extends Component {
 										:
 										<div style={{marginLeft: "53px", minHeight: "14px", height: "14px"}}></div>
 								}
+							</div>
+
+
+					}
 
 
 					{/*队员*/}
+					{
+						member_staff === undefined || member_staff === null ?
+							"" :
+							<div>
 								<div style={{
 									display: "flex",
 									flexDirection: "initial",
@@ -1397,6 +1422,9 @@ class PersonModal extends Component {
 										:
 										<div style={{marginLeft: "53px", minHeight: "18px", height: "18px"}}></div>
 								}
+							</div>
+					}
+
 					{/*表格*/}
 					<div style={{marginLeft: "53px", border: "1px solid #E0E0E0"}}>
 						{/*<PersonModaltion ></PersonModaltion>*/}