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 支持，Saber 将不能正常工作。请启用浏览器的 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> }</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 支持，Saber 将不能正常工作。请启用浏览器的 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> 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); 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); //从缓存中未获取到超级管理员配置信息，从nacos上重新获取并存入缓存。 if(Func.isEmpty(user)){ String tenantId = environment.getProperty("user-info.tenant-id", "000000"); //从缓存中未获取到超级管理员配置信息或者和nacos上配置的租户不一致，从nacos上重新获取并存入缓存。 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); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -618,10 +618,13 @@ createList.add(newSecDO); } // 处理分类码段的oid，因为oid关联parentClassifyOid，与码值codeClassifyOid，码值又需要通过旧的码段oid来查询，所以不能直接改变oid 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 = true; if(!codeFixedValueMaps.isEmpty()){ // 克隆固定码值 boolean resFixed = fixedValueService.saveBatch(codeFixedDOValues); return (resBoolean&&resFixed&&resChangeAssn) ? R.data(resBoolean,"克隆码段信息成功"):R.fail("克隆码段信息失败！"); resFixed = fixedValueService.saveBatch(codeFixedDOValues); } return (resBoolean&&resFixed) ? R.data(resBoolean,"克隆码段信息成功"):R.fail("克隆码段信息失败！"); } /** 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;
