Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -1908,9 +1908,17 @@ public class TodoTaskController extends BaseAction {
                 }else{
                     return "0";
                 }
+            }else {
+                QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("PRC_ID", pId);
+                queryWrapper2.isNotNull("OVER_TIME");
+                BusProcessName one = iBusProcessNameService.getOne(queryWrapper2);
+                if (null!=one){
+                    return "1";
                 }else {
                     return "0";
                 }
+            }
         } else {
             return "1";
         }