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

2022-04-08 18:07:13 +08:00
parent 219f359f96 4fabc7b061
commit 4b996bb7ee
1 changed files with 9 additions and 1 deletions
@@ -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";
        }