121016.33

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

@@ -1381,7 +1381,7 @@ public class ActTaskService extends BaseService {
 					vars.put("coveredPerson","施工单位");
 					vars.put("pass3",true);
 				}
-				if (!flagDesign&&!flagItemCLose&&"空".equals(flagDeal)){
+				if (!flagDesign&&!flagItemCLose&&"init".equals(flagDeal)){
 					vars.put("pass",true);
 				}
 			}
@@ -2111,13 +2111,12 @@ public class ActTaskService extends BaseService {
 	}
 	public String  newJudgeDeal(Disclose disclose){
 		String flag = "init";
+		String a = "";
 		if (null!=disclose.getAdministrationType()){
 			if (disclose.getAdministrationType().contains("民事政处")||disclose.getAdministrationType().contains("农村政处")){
 				flag = "民事农村";
 			} else if (disclose.getAdministrationType().contains("行政政处(城区道路)")) {
 				flag = "行政";
-			} else {
-				flag = "请填写正确的政策类型";
 			}
 		}
 //		if (null!)

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

@@ -762,10 +762,6 @@ public class ActTaskController extends BaseController {
 					flag = true;
 				}
 			}
-			if ("空".equals(flagDeal)) {
-				s += "政策类型不能为空";
-				flag = true;
-			}
 /*			if (flagDeal){
 				if (null==disclose.getPolicyHandlingInstructions()||disclose.getPolicyHandlingInstructions().equals("")){
 					s+=" 政策处理说明不能为空!";