From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 9c7ef7e..6ca0d54 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -276,7 +276,7 @@
}
private void getTjPackageList(List<TjPackage> tjPackageList) {
- if (null != tjPackageList && tjPackageList.size() > 0) {
+ if (null != tjPackageList && !tjPackageList.isEmpty()) {
for (TjPackage aPackage : tjPackageList) {
List<TjProject> tjProjectList = new ArrayList<>();
List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
@@ -648,12 +648,10 @@
List<TjPackageProject> projectList = tjPackage.getPackageProjects();
if (null != projectList && !projectList.isEmpty()) {
if(StringUtil.isNotBlank(tjPackage.getPacId())){
- if (ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId())) {
- for (TjPackageProject project : projectList) {
- project.setPacId(tjPackage.getPacId());
- ppservice.save(project);
- }
-
+ ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId());
+ for (TjPackageProject project : projectList) {
+ project.setPacId(tjPackage.getPacId());
+ ppservice.save(project);
}
}
}
--
Gitblit v1.8.0