1

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/ItemGroupServiceImpl.java

@@ -53,36 +53,45 @@ public class ItemGroupServiceImpl implements ItemGroupService {
             if (itemGroupDao.updateItemGroup(itemGroup) <= 0) {
                 return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改item组失败");
             }
-            List<Item> itemList = itemGroup.getItemList();
-            if (Blank.isEmpty(itemList)) {
-                itemGroupDao.delItemByGroupId(id);
-                return Result.ok("修改item组成功");
-            }
-            List<Item> oldItemList = itemGroupDao.getItemList(id);
-            if (Blank.isEmpty(oldItemList)) {
-                itemGroupDao.addItem(id, itemList);
-                return Result.ok("修改item组成功");
-            }
-            List<Item> publicItemList = itemGroupDao.getPublicItemList(id, itemList);
-            if (Blank.isEmpty(publicItemList)) {
-                itemGroupDao.delItemByGroupId(id);
-                itemGroupDao.addItem(id, itemList);
-                return Result.ok("修改item组成功");
-            }
-            itemGroupDao.delItemNoPub(id, publicItemList);
-            List<Item> addItemList = new ArrayList<>();
-            for (int i = 0; i < itemList.size(); i++) {
-                Boolean flage = true;
-                for (int j = 0; j < publicItemList.size(); j++) {
-                    if (itemList.get(i).getItemGroupId().equals(publicItemList.get(j).getItemName())) {
-                        flage = false;
+            if (Blank.isNotEmpty(itemGroup.getDataSourceId()) && Blank.isNotEmpty(itemGroup1.getDataSourceId())) {
+                if (itemGroup.getDataSourceId() == itemGroup1.getDataSourceId()) {
+                    List<Item> itemList = itemGroup.getItemList();
+                    if (Blank.isEmpty(itemList)) {
+                        itemGroupDao.delItemByGroupId(id);
+                        return Result.ok("修改item组成功");
                     }
+                    List<Item> oldItemList = itemGroupDao.getItemList(id);
+                    if (Blank.isEmpty(oldItemList)) {
+                        itemGroupDao.addItem(id, itemList);
+                        return Result.ok("修改item组成功");
+                    }
+                    List<Item> publicItemList = itemGroupDao.getPublicItemList(id, itemList);
+                    if (Blank.isEmpty(publicItemList)) {
+                        itemGroupDao.delItemByGroupId(id);
+                        itemGroupDao.addItem(id, itemList);
+                        return Result.ok("修改item组成功");
+                    }
+                    itemGroupDao.delItemNoPub(id, publicItemList);
+                    List<Item> addItemList = new ArrayList<>();
+                    for (int i = 0; i < itemList.size(); i++) {
+                        Boolean flage = true;
+                        for (int j = 0; j < publicItemList.size(); j++) {
+                            if (itemList.get(i).getItemGroupId().equals(publicItemList.get(j).getItemName())) {
+                                flage = false;
+                            }
+                        }
+                        if (flage) {
+                            addItemList.add(itemList.get(i));
+                        }
+                    }
+                    itemGroupDao.addItem(id, addItemList);
+                    return Result.ok("修改item组成功");
                 }
-                if (flage) {
-                    addItemList.add(itemList.get(i));
-                }
             }
-            itemGroupDao.addItem(id, addItemList);
+            itemGroupDao.delItemByGroupId(id);
+            if (Blank.isNotEmpty(itemGroup.getItemList())) {
+                itemGroupDao.addItem(id, itemGroup.getItemList());
+            }
             return Result.ok("修改item组成功");
         }
     }