zcloud_gbs
/
zcloud_gbs_domain
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

06-03 需求变更：/domainDepartment/listAll接口：domain_group与domain_department接触关联

master
tianxinlei 2026-06-03 15:04:45 +08:00
parent f7eb93febc
commit 1fd7eb5ea6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/domain.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/3 09:01:54) App/domain"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/3 14:07:11) App/domain"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/domain/static/js/888.1cfe3f1827874068cf00.js"></script><script defer="defer" src="/domain/static/js/410.8685ba962e58528152e2.js"></script><script defer="defer" src="/domain/static/js/main.de8b6325fceaeff238a3.js"></script><link href="/domain/static/css/main.c74fbb90829596498e3a.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/3 09:01:54) App/domain Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/domain/static/js/888.1cfe3f1827874068cf00.js"></script><script defer="defer" src="/domain/static/js/410.8685ba962e58528152e2.js"></script><script defer="defer" src="/domain/static/js/main.ffc48f120fb9dd783069.js"></script><link href="/domain/static/css/main.c74fbb90829596498e3a.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/3 14:07:11) App/domain Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

2
start/src/main/resources/templates/domain/static/js/main.ffc48f120fb9dd783069.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/domain/static/js/main.ffc48f120fb9dd783069.js.LICENSE.txt Normal file
View File

@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

9
web-app/src/main/java/com/zcloud/domain/command/query/DomainDepartmentQueryExe.java
View File

@ -97,11 +97,12 @@ public class DomainDepartmentQueryExe {
public List<DomainDepartmentCO> listAll() { public List<DomainDepartmentCO> listAll() {
//如果不是监管端，则不能查看所有 //如果不是监管端，则不能查看所有
// 2026-06-03 需求修改：领域类型与领域组不存在强绑定关系，可以看到所有类型
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
corpInfoRepository.isSupper(); // corpInfoRepository.isSupper();
if(!corpInfoRepository.isSupper()){ // if(!corpInfoRepository.isSupper()){
params.put("corpinfoId", AuthContext.getTenantId()); // params.put("corpinfoId", AuthContext.getTenantId());
} // }
List<DomainDepartmentDO> domainDepartmentDOList =domainDepartmentRepository.listAll(params); List<DomainDepartmentDO> domainDepartmentDOList =domainDepartmentRepository.listAll(params);
List<DomainDepartmentCO> domainDepartmentCOList = domainDepartmentCoConvertor.converDOsToCOs(domainDepartmentDOList); List<DomainDepartmentCO> domainDepartmentCOList = domainDepartmentCoConvertor.converDOsToCOs(domainDepartmentDOList);
return domainDepartmentCOList; return domainDepartmentCOList;

4
web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml
View File

@ -36,11 +36,7 @@
from domain_department dd from domain_department dd
left join department d on dd.master_department_id = d.id left join department d on dd.master_department_id = d.id
left join user u on dd.master_user_id = u.id left join user u on dd.master_user_id = u.id
left join domain_group dg on dd.domain_type = dg.domain_type and dg.delete_enum='FALSE'
where dd.delete_enum = 'FALSE' where dd.delete_enum = 'FALSE'
<if test="corpinfoId != null ">
and dg.corpinfo_id =#{corpinfoId}
</if>
group by dd.id group by dd.id
order by dd.create_time desc order by dd.create_time desc
</select> </select>