From d14f8e30ed792931ccc012b10904831db1b6b803 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:39 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS-WEB/src/views/code/code.vue | 15 ++++++++-------
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 1 -
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 0aa01d7..8cffe1c 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -835,6 +835,7 @@
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import {getByRoleUserList} from "@/api/system/user";
+ import func from "@api/util/func";
export default {
data() {
@@ -2616,7 +2617,7 @@
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
- if(this.enumParam.secTypeList.length==0){
+ if(func.isEmpty(this.enumParam.secTypeList) || this.enumParam.secTypeList.length==0){
this.loadCodeSecType();
}
if(row != null){
@@ -2752,14 +2753,14 @@
},
/** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
- this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
+ this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType") | [];
this.loadCodeSecLength();
},
loadCodeSecLength(){
- this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength");
+ this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength") | [];
},
loadCodeFillType(){
- this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
+ this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") | [];
},
loadCodeFillSeparator(){
let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
@@ -2771,13 +2772,13 @@
}
},
loadCodeLevelType(){
- this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
+ this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") | [];
},
loadCodeCutType(){
- this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType");
+ this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType") | [];
},
loadCodeGetValueType(){
- this.enumParam.codeGetValueType = this.getLocalStorageEnum("codeGetValueType");
+ this.enumParam.codeGetValueType = this.getLocalStorageEnum("codeGetValueType") | [];
},
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index f84bca4..5ac72c8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -206,7 +206,6 @@
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
</select>
-
<select id="selectByFieldNamePath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
--
Gitblit v1.9.3