Merge branch 'master' of github.com:easysoft/zentaopms

2018-12-29 14:55:23 +08:00
parent ca688aa2f8 78a2fc9099
commit 7965361268
1 changed files with 4 additions and 0 deletions
@@ -372,6 +372,10 @@ class taskModel extends model
            {
                $status = 'doing';
            }
+            elseif(isset($childrenStatus['done']) && isset($childrenStatus['wait']))
+            {
+                $status = 'doing';
+            }
            elseif(isset($childrenStatus['wait']))
            {
                $status = 'wait';