Browse Source

解决修改报错的问题

dzx 1 year ago
parent
commit
3e6a50a421

+ 24 - 17
src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -108,26 +108,33 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             List<TextbookSubscriptionRecord> textbookSubscriptionRecordList = textbookTextbookSubscriptionRecordMapper.selectList(Wrappers.lambdaQuery(TextbookSubscriptionRecord.class).eq(TextbookSubscriptionRecord::getWfTextbookSubscriptionId, textbook.getId()).select(TextbookSubscriptionRecord::getId));
             List<Long> textbookSubscriptionRecordIds = textbookSubscriptionRecordList.stream().map(TextbookSubscriptionRecord::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
-            List<Long> textbookSubscriptionRecordOldIds = textbook.getTextbookSubscriptionRecordList().stream().map(TextbookSubscriptionRecord::getId).filter(Objects::nonNull).collect(Collectors.toList());
-            //找到需要删除的id
-            List<Long> textbookSubscriptionRecordRemoveIds = textbookSubscriptionRecordIds.stream().filter(item -> !textbookSubscriptionRecordOldIds.contains(item)).collect(Collectors.toList());
-
-            for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
-                //如果不等于空则修改
-                if (textbookSubscriptionRecord.getId() != null) {
-                    textbookTextbookSubscriptionRecordMapper.updateById(textbookSubscriptionRecord);
+            if(!textbookSubscriptionRecordIds.isEmpty()){
+                List<Long> textbookSubscriptionRecordOldIds = textbook.getTextbookSubscriptionRecordList().stream().map(TextbookSubscriptionRecord::getId).filter(Objects::nonNull).collect(Collectors.toList());
+                //找到需要删除的id
+                List<Long> textbookSubscriptionRecordRemoveIds = textbookSubscriptionRecordIds.stream().filter(item -> !textbookSubscriptionRecordOldIds.contains(item)).collect(Collectors.toList());
+
+                for (TextbookSubscriptionRecord textbookSubscriptionRecord : textbook.getTextbookSubscriptionRecordList()) {
+                    //如果不等于空则修改
+                    if (textbookSubscriptionRecord.getId() != null) {
+                        textbookTextbookSubscriptionRecordMapper.updateById(textbookSubscriptionRecord);
+                    }
+                    //如果等于空 则新增
+                    else {
+                        //已经不存在的id 删除
+                        textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
+                        textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                    }
                 }
-                //如果等于空 则新增
-                else {
-                    //已经不存在的id 删除
-                    textbookSubscriptionRecord.setWfTextbookSubscriptionId(textbook.getId());
-                    textbookTextbookSubscriptionRecordMapper.insert(textbookSubscriptionRecord);
+                //已经不存在的id 删除
+                if(textbookSubscriptionRecordRemoveIds.size() > 0){
+                    textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
                 }
             }
-            //已经不存在的id 删除
-            if(textbookSubscriptionRecordRemoveIds.size() > 0){
-                textbookTextbookSubscriptionRecordMapper.deleteBatchIds(textbookSubscriptionRecordRemoveIds);
-            }
+
+
+
+
+
         }
         //********************************* TextbookSubscriptionRecord  增删改  结束 *******************************************/