Browse Source

同步-表单同步-同步其他表单时 强制同步所有表单信息,并且保留原节点名称

LHB 1 month ago
parent
commit
bd5fa58405

+ 6 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousEViSaServiceImpl.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -65,10 +66,15 @@ public class WbsSynchronousEViSaServiceImpl {
 
     @Transactional(rollbackFor = Exception.class)
     public void syncPrivateForceForm(WbsTreePrivate wbsTreePrivate, String nodeId, Long id) {
+        WbsTreePrivate wbsTreePrivate1 = wbsTreePrivateMapper.selectById(nodeId);
+
         wbsTreePrivateMapper.update(null, Wrappers.<WbsTreePrivate>lambdaUpdate()
                 .set(WbsTreePrivate::getExcelId, wbsTreePrivate.getExcelId())
                 .set(WbsTreePrivate::getInitTableName, wbsTreePrivate.getInitTableName())
+                .set(WbsTreePrivate::getInitTableId, wbsTreePrivate.getInitTableId())
                 .set(WbsTreePrivate::getHtmlUrl, wbsTreePrivate.getHtmlUrl())
+                .set(StringUtils.isBlank(wbsTreePrivate.getFullName()),WbsTreePrivate::getFullName, wbsTreePrivate1.getNodeName())
+                .set(WbsTreePrivate::getNodeName, wbsTreePrivate.getNodeName())
                 .in(WbsTreePrivate::getPKeyId, nodeId)
         );
         synchronousRecordMapper.update(null, Wrappers.<WbsTreeSynchronousRecord>lambdaUpdate()

+ 3 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

@@ -170,6 +170,9 @@ public class WbsSynchronousServiceImpl {
             throw new ServiceException("不能选中多个节点");
         }
         String formIds = wbsTreeSynchronousRecord.getFormIds();
+        if (formIds.contains(",")) {
+            throw new ServiceException("不能选中多个节点");
+        }
         //选中的表单
         WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectById(formIds);
         if (wbsTreePrivate == null) {