From 3ff6166ea62799068064845fb083d1abb3d902a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 14:47:42 +0800
Subject: [PATCH] plt-slice属性调整后WEB端引用的旧属性也做了相应的调整

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index ffcfde3..dca912d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -1358,7 +1358,7 @@
         BaseModel baseModel = new BaseModel();
         baseModel.setOid(cbo.oid);
         baseModel.setNameOid(cbo.nameoid);
-        baseModel.setRevisionOid(cbo.revisionid);
+        baseModel.setRevisionOid(cbo.revoid);
         baseModel.setBtmName(cbo.btName);
         baseModel.setLastR(String.valueOf(cbo.isLastR));
         baseModel.setLastV(String.valueOf(cbo.isLastV));
@@ -2156,7 +2156,7 @@
                     //璇存槑鏄崌鐗�
                     BaseModel baseModel = cbo2BaseModel(cbo);
                     RevisionDataInfo revisionValueObject = getNextRevision(btmTypeVO,baseModel);
-                    cbo.revisionid = VciBaseUtil.getPk();
+                    cbo.revoid = VciBaseUtil.getPk();
                     cbo.revisionSeq = revisionValueObject.revisionSeq;
                     cbo.revisionValue = revisionValueObject.revisionVal;
                     cbo.isLastR = true;
@@ -2251,8 +2251,8 @@
                 if (StringUtils.isBlank(cbo.nameoid)) {
                     cbo.nameoid = VciBaseUtil.getPk();
                 }
-                if (StringUtils.isBlank(cbo.revisionid)) {
-                    cbo.revisionid = VciBaseUtil.getPk();
+                if (StringUtils.isBlank(cbo.revoid)) {
+                    cbo.revoid = VciBaseUtil.getPk();
                 }
                 cbo.isFirstR = true;
                 cbo.isLastR = true;
@@ -2695,9 +2695,9 @@
             throw new PLException("500", new String[]{"娌℃湁鑾峰彇鍒版暟鎹殑涓婚敭"});
         }
         for (BusinessObject cbo : cbos) {
-            if(StringUtils.isBlank(cbo.revisionid)){
-                String revisionoid = Arrays.stream(cbo.hisAttrValList).filter(e -> e.attrName.equals("REVISIONOID")).findFirst().map(e -> e.attrVal).orElse("");
-                cbo.revisionid = revisionoid;
+            if(StringUtils.isBlank(cbo.revoid)){
+                String revisionoid = Arrays.stream(cbo.hisAttrValList).filter(e -> e.name.equals("REVISIONOID")).findFirst().map(e -> e.value).orElse("");
+                cbo.revoid = revisionoid;
             }
             boolean b = platformClientUtil.getBOFService().deleteBusinessObject(cbo,type);
             if(!b){

--
Gitblit v1.9.3