test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 修复低版本升级上来的默认配额显示错误问题 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2023-05-30 17:59:23 +08:00 committed by fit2-zhao
parent c875969fa8
commit 402abd81bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/ExtQuotaMapper.xml
View File

@ -11,7 +11,7 @@
<select id="listWorkspaceQuota" resultMap="BaseResultMap">
select w.name as workspace_name, w.id as workspace_id, q.id, q.api, q.performance,
q.max_threads, q.duration, q.resource_pool, q.workspace_id, q.use_default, q.update_time,
q.max_threads, q.duration, q.resource_pool, q.workspace_id, COALESCE(q.use_default,1) use_default, q.update_time,
q.member, q.project, q.project_id, q.vum_total, temp.vum_used, temp.project_used
from workspace as w
left join quota as q on w.id = q.workspace_id
@ -103,7 +103,7 @@
</select>
<select id="listProjectQuota" resultMap="BaseResultMap">
SELECT p.name AS project_name, p.id AS project_id, p.workspace_id AS workspace_id, q.*
SELECT p.name AS project_name, p.id AS project_id, p.workspace_id AS workspace_id, COALESCE(q.use_default,1) use_default, q.*
FROM project AS p LEFT JOIN quota AS q
ON p.id = q.project_id
<where>