4.21bug优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TpPlanActivityServiceImpl.java

@@ -186,19 +186,21 @@ public class TpPlanActivityServiceImpl extends ServiceImpl<TpPlanActivityMapper,
         if (null != tpPlanActivityEW) {
             // 查出TPplanId 下的 活动
             tpPlanActivityEW.setDeleted(ProjectConstant.DELETED_NO);
-            tpPlanActivityEW.setTpPlanId(tpPlanActivity.getTpPlanId());
-            ew = new EntityWrapper<>(tpPlanActivityEW);
-            ew.orderBy("sort", true);
-            List<TpPlanActivity> activities = tpPlanActivityMapper.selectList(ew);
-            if (!CollectionUtils.isEmpty(activities)) {
-                // 更新活动排序
-                TpPlanActivity activity = new TpPlanActivity();
-                int index = 0;
-                for (TpPlanActivity a : activities) {
-                    index++;
-                    activity.setId(a.getId());
-                    activity.setSort(index);
-                    activity.updateById();
+            if(tpPlanActivity.getTpPlanId()!=null) {
+                tpPlanActivityEW.setTpPlanId(tpPlanActivity.getTpPlanId());
+                ew = new EntityWrapper<>(tpPlanActivityEW);
+                ew.orderBy("sort", true);
+                List<TpPlanActivity> activities = tpPlanActivityMapper.selectList(ew);
+                if (!CollectionUtils.isEmpty(activities)) {
+                    // 更新活动排序
+                    TpPlanActivity activity = new TpPlanActivity();
+                    int index = 0;
+                    for (TpPlanActivity a : activities) {
+                        index++;
+                        activity.setId(a.getId());
+                        activity.setSort(index);
+                        activity.updateById();
+                    }
                 }
             }
         }