diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index fb079d621..9fee158ba 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -1834,8 +1834,8 @@ class PollNew extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 					insert_id: insert_id
@@ -1911,8 +1911,8 @@ class PollNew extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 				};
@@ -2775,7 +2775,7 @@ class PollNew extends Component {
 									<span
 										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
 									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">
@@ -2981,7 +2981,7 @@ class PollNew extends Component {
 																							</style>
 																							<Select className="fl  w100"
 																											onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																											value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
+																											value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
 
 																							>
 																								<Option value={"0"}>--</Option>
@@ -2996,7 +2996,7 @@ class PollNew extends Component {
 																							{/*可选最大*/}
 																							<Select className="fl w100"
 																											onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)}
-																											value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																											value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
 																							>
 																								<Option value={"0"}>--</Option>
 																								{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {