Merge remote-tracking branch 'origin/master'

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

@@ -1129,26 +1129,22 @@ public class ActTaskService extends BaseService {
 		vars.put("pass2", false);
 		vars.put("pass3", false);
 		vars.put("pass4", false);
-		if (null!=disclose){
-			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);
-				}
-			}else {
-				vars.put("pass4", true);
-			}
-		}else {
-			vars.put("pass",true);
-		}
+        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);
+            }
+        }else {
+            vars.put("pass4", true);
+        }
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 

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

@@ -408,13 +408,17 @@ public class ActTaskController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = "audit3")
 	public AjaxJson auditTask3(Act act) {
-		System.out.println("项目定义号="+act.getProcInsId());
 		AjaxJson j = new AjaxJson();
 		String s = "";
 		boolean flag = false;
 		Disclose dc = new Disclose();
 		dc.setProcInsId(act.getProcInsId());
 		Disclose disclose = discloseService.get(dc);
+		if (null!=disclose){
+			j.setSuccess(false);
+			j.setMsg("请导入数据");
+			return j;
+		}
 		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);
 		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);
 		Boolean flagDeal =actTaskService.isJudgeDeal(disclose);