单份复制随机值问题

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1499,7 +1499,7 @@ public class InformationWriteQueryController extends BladeController {
                         String keys = StringUtils.join(filteredList, ",");
 
                         /*重置*/
-                        //Map<String, String> eMap = reviseValue(nodeOld, null, ekvMap);
+                        Map<String, String> eMap = reviseValue(nodeOld, null, ekvMap);
 
                         //构造入参（获取列名、列值）
                         String dataSql = "SELECT " + keys + " FROM " + tableName + " WHERE p_key_id= " + nodeOld.getPKeyId() + " LIMIT 1;";
@@ -1527,8 +1527,8 @@ public class InformationWriteQueryController extends BladeController {
                             LinkedHashMap<String, Object> resultMap = resultList.get(0);
                             for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
                                 keySet.add(entry.getKey());
-                                /*Object value = reviseValue(eMap, entry.getKey(), entry.getValue());*/
-                                Object value = entry.getValue();
+                                Object value = reviseValue(eMap, entry.getKey(), entry.getValue());
+                                //Object value = entry.getValue();
                                 if (value != null) {
                                     if (value.toString().contains("\n")) {
                                         //如果值中包含换行符，则将换行符替换

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -347,9 +347,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             for (WbsTreePrivateDTO3 wbsTreePrivate : wbsTreePrivates) {
                 //数据变动才修改
                 if (!wbsTreePrivateNameMap.get(wbsTreePrivate.getPKeyId()).equals(wbsTreePrivate.getNodeName())
-                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getTableType()) && !wbsTreePrivateTabTypeMap.get(wbsTreePrivate.getPKeyId()).equals(wbsTreePrivate.getTableType()))
-                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getTableOwner()) && !wbsTreePrivateTabOwnerMap.get(wbsTreePrivate.getPKeyId()).equals(wbsTreePrivate.getTableOwner()))
-                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getFillRate()) && !wbsTreePrivateFillRateMap.get(wbsTreePrivate.getPKeyId()).equals(wbsTreePrivate.getFillRate()))
+                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getTableType()) && !wbsTreePrivate.getTableType().equals(wbsTreePrivateTabTypeMap.getOrDefault(wbsTreePrivate.getPKeyId(), -99)))
+                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getTableOwner()) && !wbsTreePrivate.getTableOwner().equals(wbsTreePrivateTabOwnerMap.getOrDefault(wbsTreePrivate.getPKeyId(), "")))
+                        || (ObjectUtil.isNotEmpty(wbsTreePrivate.getFillRate()) && !wbsTreePrivate.getFillRate().equals(wbsTreePrivateFillRateMap.getOrDefault(wbsTreePrivate.getPKeyId(), "")))
                 ) {
                     WbsTreePrivate wbsTreePrivateParam = BeanUtil.copyProperties(wbsTreePrivate, WbsTreePrivate.class);
                     if (wbsTreePrivateParam != null) {
@@ -384,7 +384,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
             }
         } catch (Exception e) {
             e.printStackTrace();
-            throw new ServiceException("修改同步到合同段时异常" + e.getMessage());
+            throw new ServiceException("修改同步到合同段时异常，原因：" + e.getMessage());
         }
         return true;
     }