添加查询条件

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -130,7 +130,7 @@ public class ClassDefChangeRecordService {
         Map<Integer, ClassDefChangeRecord> dataMap = data.stream().collect(Collectors.toMap(ClassDefChangeRecord::getId, Function.identity()));
         for (ClassDefChangeRecord param : list) {
             ClassDefChangeRecord changeRecord = dataMap.get(param.getId());
-            if (changeRecord.getState() == 1) {
+            if (changeRecord.getState() == 1 && changeRecord.getVersion() == null) {
                 if (param.getAliasCode() != null) {
                     changeRecord.setAliasCode(param.getAliasCode());
                 }

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -158,7 +158,7 @@ public class FuncidDefChangeRecordService {
         Map<Integer, FuncidDefChangeRecord> dataMap = data.stream().collect(Collectors.toMap(FuncidDefChangeRecord::getId, Function.identity()));
         for (FuncidDefChangeRecord param : list) {
             FuncidDefChangeRecord changeRecord = dataMap.get(param.getId());
-            if (changeRecord.getState() == 1) {
+            if (changeRecord.getState() == 1 && changeRecord.getVersion() == null) {
                 if (param.getAliasCode() != null) {
                     changeRecord.setAliasCode(param.getAliasCode());
                 }

dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditVersionService.java

@@ -158,7 +158,7 @@ public class RwdeditVersionService {
 
         OutputStream out = null;
         try {
-            InputStream stream = getStream(sqlList);
+            ByteArrayInputStream stream = getStream(sqlList);
             resp.reset();// 清空输出流
             String resultFileName = URLEncoder.encode(fileName, "UTF-8");
             resp.setCharacterEncoding("UTF-8");
@@ -186,7 +186,7 @@ public class RwdeditVersionService {
         }
     }
 
-    public InputStream getStream(List<String> list) throws IOException {
+    public ByteArrayInputStream getStream(List<String> list) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(baos);
         for (String sql : list) {