履职计划触发任务生成功能完善

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -148,7 +148,10 @@ public class ApiPlanController {
                             .eq(AppPlan::getParentId, plan.getId())
                             .eq(AppPlan::getDeleted, 0)
                             .eq(AppPlan::getPlanStatus,1));
-                    list.add(plan);
+                    if(ObjectUtil.equal(plan.getPlanStatus(),1)){
+                        list.add(plan);
+                    }
+
                     List<Object> newlist = new ArrayList<>(list);
                     resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
                 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -247,7 +247,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             ap.setPlanStatus(2);
             baseMapper.updateById(ap);
 
-            if (ObjectUtil.notEqual(ap.getTaskHasCompleted(), 1)) {
+            if (ObjectUtil.notEqual(plan.getTaskHasCompleted(), 1)) {
                 deleteByPlanIds.add(ap.getId());
             }
         }