Merge remote-tracking branch 'origin/dev_1024'

3 years ago · 04d85d8216
1 changed files with 3 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@ -438,7 +438,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                entity.setUpdatedTime(new Date());
                list.add(entity);
            }
-            dataSyncRecordDisabilityService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
+            if (CollectionUtils.isNotEmpty(list)){
+                dataSyncRecordDisabilityService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED);
+            }
        } catch (Exception e) {
            log.error("canJi exception", e);
        }