From f31b1b0a442c83432de9bdf6bc4539bc68acaf6c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十月 2023 19:57:51 +0800
Subject: [PATCH] 修改从其他规则中克隆码段反馈信息错误的bug
---
Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 16 +++++++++++-----
Source/UBCS-WEB/dist/index.html | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java | 4 ----
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java | 7 ++++---
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/dist/index.html b/Source/UBCS-WEB/dist/index.html
index ee63c0b..959d679 100644
--- a/Source/UBCS-WEB/dist/index.html
+++ b/Source/UBCS-WEB/dist/index.html
@@ -51,4 +51,4 @@
.avue-home__sub-title {
color: #ABABAB;
font-size: 12px;
- }</style><link href=/css/chunk-267b1383.3aba5e1a.css rel=prefetch><link href=/css/page.e84a6fd9.css rel=prefetch><link href=/css/views.cd3521c3.css rel=prefetch><link href=/js/chunk-267b1383.504d1b95.js rel=prefetch><link href=/js/chunk-2d0e4caf.c02e3bd1.js rel=prefetch><link href=/js/page.4509ac44.js rel=prefetch><link href=/js/views.bc3fd1e6.js rel=prefetch><link href=/css/app.c4a4ff7f.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.42e5aacd.js rel=preload as=script><link href=/js/chunk-vendors.e37ddf76.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.c4a4ff7f.css rel=stylesheet></head><body><noscript><strong>寰堟姳姝夛紝濡傛灉娌℃湁 JavaScript 鏀寔锛孲aber 灏嗕笉鑳芥甯稿伐浣溿�傝鍚敤娴忚鍣ㄧ殑 JavaScript 鐒跺悗缁х画銆�</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>姝ｅ湪鍔犺浇璧勬簮</div><div class="avue-home__sub-title d">鍒濇鍔犺浇璧勬簮鍙兘闇�瑕佽緝澶氭椂闂� 璇疯�愬績绛夊緟</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.e37ddf76.js></script><script src=/js/app.42e5aacd.js></script></body></html>
\ No newline at end of file
+ }</style><link href=/css/chunk-267b1383.3aba5e1a.css rel=prefetch><link href=/css/page.e84a6fd9.css rel=prefetch><link href=/css/views.cd3521c3.css rel=prefetch><link href=/js/chunk-267b1383.504d1b95.js rel=prefetch><link href=/js/chunk-2d0e4caf.c02e3bd1.js rel=prefetch><link href=/js/page.4509ac44.js rel=prefetch><link href=/js/views.bc3fd1e6.js rel=prefetch><link href=/css/app.c4a4ff7f.css rel=preload as=style><link href=/css/chunk-vendors.e41156d0.css rel=preload as=style><link href=/js/app.b2450eae.js rel=preload as=script><link href=/js/chunk-vendors.e37ddf76.js rel=preload as=script><link href=/css/chunk-vendors.e41156d0.css rel=stylesheet><link href=/css/app.c4a4ff7f.css rel=stylesheet></head><body><noscript><strong>寰堟姳姝夛紝濡傛灉娌℃湁 JavaScript 鏀寔锛孲aber 灏嗕笉鑳芥甯稿伐浣溿�傝鍚敤娴忚鍣ㄧ殑 JavaScript 鐒跺悗缁х画銆�</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=/svg/loading-spin.svg alt=loading><div class=avue-home__title>姝ｅ湪鍔犺浇璧勬簮</div><div class="avue-home__sub-title d">鍒濇鍔犺浇璧勬簮鍙兘闇�瑕佽緝澶氭椂闂� 璇疯�愬績绛夊緟</div></div></div></div><script src=/util/aes.js charset=utf-8></script><script src=/cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=/cdn/vuex/3.1.1/vuex.min.js charset=utf-8></script><script src=/cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=/cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=/cdn/element-ui/2.15.6/index.js charset=utf-8></script><script src=/cdn/avue/2.9.12/avue.min.js charset=utf-8></script><script src=/cdn/nutflow/wf-design-base/index.umd.min.js charset=utf-8></script><script src=/js/chunk-vendors.e37ddf76.js></script><script src=/js/app.b2450eae.js></script></body></html>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
index 2338530..4760a85 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue
@@ -174,13 +174,13 @@
},
/** 淇濆瓨浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
async saveOtherCodeBasic() {
- this.cloneSaveLoding = true;
let oid = this.quiltCloneCodeRule.oid;
let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
if (fromDialogPkCodebasic.length <= 0) {
this.$message.warning("璇烽�夋嫨鐮佹鏁版嵁!");
return;
}
+ this.cloneSaveLoding = true;
let oidArr = [];
fromDialogPkCodebasic.forEach((ele) => {
oidArr.push(ele.oid);
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
index 64f3bdd..0636f1f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
@@ -34,10 +34,11 @@
public BladeUser getAdminUserInfo() {
try {
BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
- //浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
- if(Func.isEmpty(user)){
+ String tenantId = environment.getProperty("user-info.tenant-id", "000000");
+ //浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭垨鑰呭拰nacos涓婇厤缃殑绉熸埛涓嶄竴鑷达紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
+ if(Func.isEmpty(user) || !user.getTenantId().equals(tenantId)){
BladeUser adminUser = new BladeUser();
- adminUser.setTenantId(environment.getProperty("user-info.tenant-id", "000000"));
+ adminUser.setTenantId(tenantId);
adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 00bc500..a415202 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -618,10 +618,13 @@
createList.add(newSecDO);
}
// 澶勭悊鍒嗙被鐮佹鐨刼id锛屽洜涓簅id鍏宠仈parentClassifyOid锛屼笌鐮佸�糲odeClassifyOid锛岀爜鍊煎張闇�瑕侀�氳繃鏃х殑鐮佹oid鏉ユ煡璇紝鎵�浠ヤ笉鑳界洿鎺ユ敼鍙榦id
- boolean resChangeAssn = changeParentOidAssnOid(codeClassifySec);
+ changeParentOidAssnOid(codeClassifySec);
// 灏嗗鐞嗚繃鐨勫垎绫荤爜娈典篃娣诲姞杩涜鍋氭柊澧炲鐞嗙殑鐮佹闆嗗悎涓�
createList.addAll(codeClassifySec);
- boolean resBoolean = saveBatch(createList);
+ boolean resBoolean = true;
+ if(!createList.isEmpty()){
+ resBoolean = saveBatch(createList);
+ }
// 鏈�缁堣瀛樺叆鐮佸�艰〃涓殑锛岀爜鍊煎璞�
List<CodeFixedValue> codeFixedDOValues = new ArrayList<>();
// 鏋勯�犵爜鍊煎璞★紝涓庣爜娈典富閿叧鑱斿叧绯伙紝浠ュ強鏀瑰彉鍥哄畾鐮佸�肩殑oid
@@ -633,9 +636,12 @@
codeFixedDOValues.add(item);
});
});
- // 鍏嬮殕鍥哄畾鐮佸��
- boolean resFixed = fixedValueService.saveBatch(codeFixedDOValues);
- return (resBoolean&&resFixed&&resChangeAssn) ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�");
+ boolean resFixed = true;
+ if(!codeFixedValueMaps.isEmpty()){
+ // 鍏嬮殕鍥哄畾鐮佸��
+ resFixed = fixedValueService.saveBatch(codeFixedDOValues);
+ }
+ return (resBoolean&&resFixed) ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�");
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
index 5ff19d9..d9ac268 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
@@ -2,10 +2,6 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
-import com.vci.ubcs.code.entity.CodeAllCode;
-import com.vci.ubcs.code.entity.CodeRule;
-import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.revision.model.BaseModel;
--
Gitblit v1.9.3