From 82d09815c5efb03d448d6a5b74a5cbfe85063ebc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml | 24 +++---
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml | 7 -
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml | 1
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml | 22 ++--
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 16 ++--
Source/UBCS-WEB/src/views/wel/index.vue | 8 +
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 3
Source/UBCS-WEB/src/views/docking/infoForm.vue | 19 +++-
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml | 23 -----
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml | 18 ++--
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java | 2
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java | 6 +
Source/UBCS-WEB/src/page/login/userlogin.vue | 2
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java | 2
Source/UBCS-WEB/src/views/docking/info.vue | 7 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2
Source/UBCS-WEB/src/page/lock/index.vue | 1
Source/UBCS-WEB/src/page/index/top/index.vue | 1
Source/UBCS-WEB/src/App.vue | 4 +
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java | 6 +
Source/UBCS-WEB/src/api/resource/oss.js | 12 +++
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 23 +++--
22 files changed, 115 insertions(+), 94 deletions(-)
diff --git a/Source/UBCS-WEB/src/App.vue b/Source/UBCS-WEB/src/App.vue
index 53a3d1d..ea73e65 100644
--- a/Source/UBCS-WEB/src/App.vue
+++ b/Source/UBCS-WEB/src/App.vue
@@ -34,4 +34,8 @@
.avue-crud__pagination {
padding: 10px 0 2px 20px;
}
+
+.el-collapse-item__content {
+ padding-bottom: 0px;
+}
</style>
diff --git a/Source/UBCS-WEB/src/api/resource/oss.js b/Source/UBCS-WEB/src/api/resource/oss.js
index c8733fd..ebbced3 100644
--- a/Source/UBCS-WEB/src/api/resource/oss.js
+++ b/Source/UBCS-WEB/src/api/resource/oss.js
@@ -12,6 +12,18 @@
})
}
+export const getPage = (current, size, params) => {
+ return request({
+ url: '/api/ubcs-resource/oss/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const getDetail = (id) => {
return request({
url: '/api/ubcs-resource/oss/detail',
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 73dc835..f485dbe 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -80,16 +80,23 @@
this.idData = result
// console.log(this.$route)
getTreeList({'conditionMap[id]': this.idData}).then(res => {
- this.Treedata = res.data;
- const [firstProperty] = res.data;
- this.ModifyProperties(this.Treedata, 'text', 'label');
- this.codeClassifyOid = firstProperty.oid;
- this.coderuleoid = firstProperty.attributes.coderuleoid;
- this.$emit("coderuleoid", this.coderuleoid)
- this.$emit('Treedata', this.Treedata)
+ if(res){
+ if(res.data.length === 0){
+ this.$message.error("涓绘暟鎹垎绫绘煡璇负绌猴紒");
+ }else{
+ this.Treedata = res.data;
+ const [firstProperty] = res.data;
+ this.ModifyProperties(this.Treedata, 'text', 'label');
+ this.codeClassifyOid = firstProperty.oid;
+ this.coderuleoid = firstProperty.attributes.coderuleoid;
+ this.$emit("coderuleoid", this.coderuleoid)
+ this.$emit('Treedata', this.Treedata)
+ }
+ }
}).catch(res => {
+ console.log(res)
this.$message.error(res)
- })
+ });
},
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 33b81c4..c4e0e13 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -263,7 +263,7 @@
fileDocClassifyName: '',
hasDownload: true,
hasUpload: true,
- height: 100
+ height: 110
},
result: ''
};
@@ -382,7 +382,7 @@
this.tableHeight = 'calc(100vh - 630px)';
this.$refs.dataTable.doLayout()
} else {
- this.tableHeight = 'calc(100vh - 330px)';
+ this.tableHeight = 'calc(100vh - 350px)';
this.$refs.dataTable.doLayout()
}
},
@@ -867,8 +867,12 @@
}
}
-/deep/ .el-button {
+.el-button {
margin: 0 10px 10px 0;
+}
+
+/deep/ .dialog-footer .el-button {
+ margin: 0 10px 0 0;
}
.main {
@@ -884,11 +888,7 @@
}
.bottom {
- margin-top: 20px;
- overflow-y: scroll;
+ margin-top: 10px;
}
-.el-collapse-item__content {
- padding-bottom: 0;
-}
</style>
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index be36a62..64ec3ec 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" width="30%">
+ <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" class="avue-dialog avue-dialog--top" top="-3%" width="30%">
<el-tag v-for="tag in tags" :key="tag" closable disable-transitions effect="Plain" size="medium"
@click="handleClickTag(tag)" @close="handleCloseTag(tag)">
<span> {{ tag.name }}</span>
@@ -280,4 +280,5 @@
justify-content: end;
padding-bottom: 10px;
}
+
</style>
diff --git a/Source/UBCS-WEB/src/page/index/top/index.vue b/Source/UBCS-WEB/src/page/index/top/index.vue
index 5b10db3..3d2c4cb 100644
--- a/Source/UBCS-WEB/src/page/index/top/index.vue
+++ b/Source/UBCS-WEB/src/page/index/top/index.vue
@@ -246,6 +246,7 @@
resetRouter();
this.$router.push({path: "/login"});
});
+ localStorage.removeItem("pageFlag");
});
}
}
diff --git a/Source/UBCS-WEB/src/page/lock/index.vue b/Source/UBCS-WEB/src/page/lock/index.vue
index 2e227d3..44a11fa 100644
--- a/Source/UBCS-WEB/src/page/lock/index.vue
+++ b/Source/UBCS-WEB/src/page/lock/index.vue
@@ -48,6 +48,7 @@
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
+ localStorage.removeItem("pageFlag");
this.$store.dispatch("LogOut").then(() => {
this.$router.push({ path: "/login" });
});
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 2d86517..b08bc18 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -192,7 +192,6 @@
},
props: [],
methods: {
- // 杩欎釜鍏跺疄璺熶笅闈elok涓�涓晥鏋滐紝鎬曚笉瀹炵幇鍐欎簡涓ゆ,
closehandle(){
removeToken()
},
@@ -269,7 +268,6 @@
type: "warning",
message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
})
- // 1.5绉掑悗鎵ц 寮瑰嚭妗嗘樉绀�
setTimeout(()=>{
this.dialogFormVisible=true
},1500)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 43ccb07..9caf94c 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -200,7 +200,7 @@
width: 150
}, {
label: '鍙傛暟鍚嶇О',
- prop: 'targName',
+ prop: 'targetName',
sortable: true,
width: 150
},{
@@ -324,6 +324,7 @@
this.editAttribute = row;
this.editAttribute.sysIntParamVOs = row.sysIntParamVOs || [];
this.editAttribute.sysIntHeaderVOs = row.sysIntHeaderVOs || [];
+ this.editAttribute.type = 'edit';
this.$refs.infoForm.formData = this.editAttribute;
this.$refs.infoForm.showSubmitDialog = true;
console.log('row',row.dataFlowTypeText)
@@ -417,7 +418,7 @@
// interfaceFunction:'',
// nameSpace:'',
// soapAction:'',
- // targName:'',
+ // targetName:'',
// cxfaxis:''
// };
// this.pushTypeList.forEach(item => {
@@ -467,7 +468,7 @@
fieldType: 'text'
}, {
title: '鍙傛暟鍚嶇О',
- queryField: 'targName',
+ queryField: 'targetName',
fieldType: 'text'
}, {
title: '璋冪敤鏂瑰紡',
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index cb35816..e5b83fa 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -5,7 +5,7 @@
<el-form ref="form" :model="formData" show-message="true" inline size="medium" label-suffix=":"
class="dockingForm" :rules="rules" status-icon="true">
<el-form-item label="鎺ュ彛绫诲瀷" prop="dataFlowType">
- <el-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange">
+ <el-select v-model="formData.dataFlowType" placeholder="璇烽�夋嫨" @change="dataFlowTypeChange" :disabled="formData.type == 'edit'">
<el-option v-for="item in dataFlowTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -141,8 +141,8 @@
<el-form-item v-if="formData.interfaceType=='webService'" label="soapAction" prop="soapAction">
<el-input v-model="formData.soapAction" ></el-input>
</el-form-item>
- <el-form-item v-if="formData.interfaceType=='webService'" label="鍙傛暟鍚嶇О" prop="targName">
- <el-input v-model="formData.targName" ></el-input>
+ <el-form-item v-if="formData.interfaceType=='webService'" label="鍙傛暟鍚嶇О" prop="targetName">
+ <el-input v-model="formData.targetName" ></el-input>
</el-form-item>
<el-form-item v-if="formData.interfaceType=='webService'" label="cxfaxis" prop="cxfaxis">
<el-input v-model="formData.cxfaxis" ></el-input>
@@ -307,7 +307,7 @@
soapAction: [
{required: true, message: '璇疯緭鍏oapAction', trigger: 'blur'}
],
- targName: [
+ targetName: [
{required: true, message: '璇疯緭鍏ュ弬鏁板悕绉�', trigger: 'blur'}
],
cxfaxis: [
@@ -490,6 +490,7 @@
}
},
submitAttribute() {
+ console.log()
const that = this;
let pass=true
if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){
@@ -503,7 +504,7 @@
return;
}
this.$refs.form.validateField(['paramType','returnType','dataFlowType','pushType','classPath','requestMethod','requestUrl',
- 'interfaceFunction','nameSpace','soapAction','targName','cxfaxis'],function (errormsg, field) {
+ 'interfaceFunction','nameSpace','soapAction','targetName','cxfaxis'],function (errormsg, field) {
if (errormsg) {
pass=false
}
@@ -522,8 +523,11 @@
ordernNo:item.$index
}
})
- add(that.formData).then(res => {
- that.$message.success("淇濆瓨鎴愬姛");
+ const apiCall = that.formData.type == 'edit' ? edit : add;
+ const Message = that.formData.type == 'edit' ? "淇敼鎴愬姛" : "淇濆瓨鎴愬姛";
+ console.log( that.formData)
+ apiCall(that.formData).then(res => {
+ that.$message.success(Message);
that.showSubmitDialog = false;
this.$refs.form.resetFields();
this.formData = {
@@ -531,6 +535,7 @@
sysIntHeaderVOs: []
};
that.$emit('refreshTable');
+ that.formData.type=null;
});
}
})
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index aff2c5b..b97532d 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -188,7 +188,11 @@
created() {
this.updataArr = JSON.parse(localStorage.getItem("updataid"))
this.userid = this.$store.state.user.upadatastatus.user_id
- this.checkhandle()
+ const pageFlag = localStorage.getItem("pageFlag")
+ if (pageFlag === null) {
+ this.checkhandle()
+ localStorage.setItem("pageFlag", true)
+ }
},
computed: {
...mapGetters(["userInfo", "flowRoutes"]),
@@ -197,8 +201,6 @@
handleChange(val) {
window.console.log(val);
},
- //element缁勪欢鍏抽棴寮圭獥鐨勫欢杩熷洖璋冿紝杩欓噷娌℃湁鐢ㄥ叧闂脊绐楃殑鏂规硶锛屽洜涓哄綋鐢ㄦ埛鐐瑰嚮纭涔熸槸鍏抽棴寮圭獥锛屽鏋滅櫥褰曟垚鍔熷脊绐楀叧闂悗涔熸槸浼氭竻闄oken鍥炲埌鐧诲綍椤�
- //Xdelhandle鏄偣鍑籜鍙峰叧闂脊鍞�,delhandle鏄偣鍑诲彇娑堝叧闂脊绐�,鍦ㄨ繖鍒嗕簡涓や釜浜嬩欢
Xdelhandle() {
removeToken()
this.dialogFormVisible = false
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
index fd01d58..1409fc4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/controller/OssController.java
@@ -38,6 +38,8 @@
import javax.validation.Valid;
+import java.rmi.ServerException;
+
import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE;
/**
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
index 4164439..c238494 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
@@ -4,26 +4,3 @@
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}
- servlet:
- multipart:
- max-file-size: 500MB
- max-request-size: 500MB
-
-#鏈嶅姟鍣ㄧ鍙�
-server:
- port: 36007
-
-#榛樿瀵硅薄瀛樺偍閰嶇疆
-oss:
- enabled: true
- name: minio
- tenant-mode: true
- endpoint: http://dev.vci-tech.com:39000
- access-key: TyEeBAJiAKDvHICUVAoH
- secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
- bucket-name: vci-ubcs
-
-#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
-mybatis-plus:
- configuration:
- map-underscore-to-camel-case: false
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
index 9fe53c6..eb64df4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
@@ -24,3 +24,4 @@
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
+ call-setters-on-nulls: true
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
index c1eec08..81ffb52 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/AttachMapper.xml
@@ -5,19 +5,19 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="attachResultMap" type="com.vci.ubcs.resource.entity.Attach">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createdept" property="createDept"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
+ <result column="isdeleted" property="isDeleted"/>
<result column="link" property="link"/>
- <result column="domain_url" property="domainUrl"/>
+ <result column="domainurl" property="domainUrl"/>
<result column="name" property="name"/>
- <result column="original_name" property="originalName"/>
+ <result column="originalname" property="originalName"/>
<result column="extension" property="extension"/>
- <result column="attach_size" property="attachSize"/>
+ <result column="attachsize" property="attachSize"/>
</resultMap>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
index 790d23b..644a479 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/OssMapper.xml
@@ -5,26 +5,26 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="ossResultMap" type="com.vci.ubcs.resource.entity.Oss">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="oss_code" property="ossCode"/>
+ <result column="isdeleted" property="isDeleted"/>
+ <result column="osscode" property="ossCode"/>
<result column="category" property="category"/>
<result column="endpoint" property="endpoint"/>
- <result column="access_key" property="accessKey"/>
- <result column="secret_key" property="secretKey"/>
- <result column="bucket_name" property="bucketName"/>
- <result column="app_id" property="appId"/>
+ <result column="accesskey" property="accessKey"/>
+ <result column="secretkey" property="secretKey"/>
+ <result column="bucketname" property="bucketName"/>
+ <result column="appid" property="appId"/>
<result column="region" property="region"/>
<result column="remark" property="remark"/>
</resultMap>
<select id="selectOssPage" resultMap="ossResultMap">
- select * from pl_sys_oss where is_deleted = 0
+ select * from pl_sys_oss where isdeleted = 0
</select>
</mapper>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
index ea9ebc2..002cc0f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/mapper/SmsMapper.xml
@@ -5,20 +5,20 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="smsResultMap" type="com.vci.ubcs.resource.entity.Sms">
<result column="id" property="id"/>
- <result column="create_user" property="createUser"/>
- <result column="create_dept" property="createDept"/>
- <result column="create_time" property="createTime"/>
- <result column="update_user" property="updateUser"/>
- <result column="update_time" property="updateTime"/>
+ <result column="createuser" property="createUser"/>
+ <result column="createdept" property="createDept"/>
+ <result column="createtime" property="createTime"/>
+ <result column="updateuser" property="updateUser"/>
+ <result column="updatetime" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
- <result column="sms_code" property="smsCode"/>
- <result column="template_id" property="templateId"/>
+ <result column="isdeleted" property="isDeleted"/>
+ <result column="smscode" property="smsCode"/>
+ <result column="templateid" property="templateId"/>
<result column="category" property="category"/>
- <result column="access_key" property="accessKey"/>
- <result column="secret_key" property="secretKey"/>
- <result column="region_id" property="regionId"/>
- <result column="sign_name" property="signName"/>
+ <result column="accesskey" property="accessKey"/>
+ <result column="secretkey" property="secretKey"/>
+ <result column="regionid" property="regionId"/>
+ <result column="signname" property="signName"/>
<result column="remark" property="remark"/>
</resultMap>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
index a46d65c..4b3c4c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
@@ -86,6 +86,12 @@
private String updateUser;
/**
+ * 绉熸埛ID
+ */
+ @ApiModelProperty(value = "绉熸埛ID")
+ private String tenantId;
+
+ /**
* 鎺堟潈浜�
*/
@ApiModelProperty(value = "鎺堟潈浜�")
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
index 3526db2..5468209 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Strategy.java
@@ -152,6 +152,12 @@
@TableField(exist = false)
private String combinationNames;
+ /**
+ * 绉熸埛ID
+ */
+ @ApiModelProperty(value = "绉熸埛ID")
+ private String tenantId;
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
index fbe8bf9..0eaac57 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/UserPwdstrategy.java
@@ -17,7 +17,7 @@
/**
* (UserPwdStrtategy)瀹炰綋绫�
*
- * @author makejava
+ * @author Ludc
* @since 2023-03-20 14:59:29
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 35949f6..19fb609 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2470,7 +2470,7 @@
// conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
if(Func.isEmpty(classifyData)){
- throw new ServiceException("涓氬姟绫诲瀷閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀硅嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
+ throw new ServiceException("涓氬姟绫诲瀷涓嫳鏂囧悕绉板拰鏌ヨ鏉′欢閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀逛笟鍔＄被鍨嬩腑鍒嗙被琛ㄨ嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
}
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
index 559bcbd..bd0e411 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
@@ -39,11 +39,8 @@
LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
WHERE is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
- </if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and pou.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
and account = #{user.account}
@@ -77,7 +74,7 @@
LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
WHERE
- tenant_id = #{param1} and account = #{param2}
+ pou.tenant_id = #{param1} and account = #{param2}
<if test="param3!=null and param3 != ''">
and name = #{param3}
</if>
--
Gitblit v1.9.3