Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1130,20 +1130,20 @@ public class ActTaskService extends BaseService {
 		vars.put("pass3", false);
 		vars.put("pass4", false);
         if (null!=disclose.getPrecondition()&&!"".equals(disclose.getPrecondition())){
-            if (flagDesign){
-                vars.put("pass1", flagDesign);
-            }
-            if (flagItemCLose){
-                vars.put("pass2",flagItemCLose);
-            }
-            if (flagDeal){
-                vars.put("pass3",flagDeal);
-            }
-            if (!flagDesign&&!flagItemCLose&&!flagDeal){
-                vars.put("pass",true);
-            }
+			vars.put("pass4", true);
         }else {
-            vars.put("pass4", true);
+			if (flagDesign){
+				vars.put("pass1", flagDesign);
+			}
+			if (flagItemCLose){
+				vars.put("pass2",flagItemCLose);
+			}
+			if (flagDeal){
+				vars.put("pass3",flagDeal);
+			}
+			if (!flagDesign&&!flagItemCLose&&!flagDeal){
+				vars.put("pass",true);
+			}
         }
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -422,28 +422,30 @@ public class ActTaskController extends BaseController {
 		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);
 		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);
 		Boolean flagDeal =actTaskService.isJudgeDeal(disclose);
-		if (flagItemCLose){
-			if (null==disclose.getExplanationOfNecessity()||disclose.getExplanationOfNecessity().equals("")){
-				s="必要性问题说明不能为空!";
-				flag = true;
+		if (null==disclose.getPrecondition()||"".equals(disclose.getPrecondition())){
+			if (flagItemCLose){
+				if (null==disclose.getExplanationOfNecessity()||disclose.getExplanationOfNecessity().equals("")){
+					s="必要性问题说明不能为空!";
+					flag = true;
+				}
 			}
-		}
-		if (flagDesign){
-			if (null==disclose.getInconsistentDescription()||disclose.getExplanationOfNecessity().equals("")){
-				s+=" 图纸现场不一致说明不能为空!";
-				flag = true;
+			if (flagDesign){
+				if (null==disclose.getInconsistentDescription()||disclose.getExplanationOfNecessity().equals("")){
+					s+=" 图纸现场不一致说明不能为空!";
+					flag = true;
+				}
 			}
-		}
-		if (flagDeal){
-			if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
-				s+=" 政策处理说明不能为空!";
-				flag=true;
+			if (flagDeal){
+				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
+					s+=" 政策处理说明不能为空!";
+					flag=true;
+				}
+			}
+			if (flag){
+				j.setSuccess(false);
+				j.setMsg(s);
+				return j;
 			}
-		}
-		if (flag){
-			j.setSuccess(false);
-			j.setMsg(s);
-			return j;
 		}
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");