From e0f388fa9bf5e9e63cab8b9dcb39d9b1e220db56 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 3 Nov 2025 14:51:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=96=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/web/DepartmentController.java | 4 ++-- .../com/zcloud/basic/info/command/CorpInfoXgfAddExe.java | 2 +- .../zcloud/basic/info/command/query/CorpInfoQueryExe.java | 4 +--- .../java/com/zcloud/basic/info/dto/DepartmentTreeQry.java | 5 ----- .../basic/info/persistence/mapper/CorpInfoMapper.java | 6 ++++++ .../persistence/mapper/CorpQualificationInfoMapper.java | 6 ++++++ .../basic/info/persistence/mapper/DepartmentMapper.java | 7 ++++--- .../repository/impl/DepartmentRepositoryImpl.java | 3 +++ 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 31b85db..5fd10c6 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -89,8 +89,8 @@ public class DepartmentController { } @ApiOperation("部门树状所有数据") @PostMapping("/listTree") - public List listTree(@Validated @RequestBody DepartmentTreeQry qry) { - return departmentService.listTree(qry); + public MultiResponse listTree(@Validated @RequestBody DepartmentTreeQry qry) { + return MultiResponse.of(departmentService.listTree(qry)); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java index eccda02..d37c443 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -62,7 +62,7 @@ public class CorpInfoXgfAddExe { otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName()); otaTenantAddCmd.setTenantId(corpInfoId); otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName()); - otaTenantAddCmd.setPassword("123456"); + otaTenantAddCmd.setPassword("Aa@123456789"); log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 26f499f..1e1b381 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -52,8 +52,6 @@ public class CorpInfoQueryExe { PageResponse pageResponse = corpInfoRepository.listPage(parmas); List examCenterCOS = corpInfoCoConvertor.converDOsToCOs(pageResponse.getData()); - //TODO - //1.查找营业执照图片信息，2.查找四色图图片信息 return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -75,7 +73,7 @@ public class CorpInfoQueryExe { List corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData()); corpInfoList.forEach(corpInfo -> { Map departParmas = new HashMap<>(); - departParmas.put("eqCorpinfoId",corpInfo.getId()); + departParmas.put("eqId",corpInfo.getId()); List list = departmentRepository.listByParams(departParmas); List departmentES = corpInfoCoConvertor.converDOsToDepartE(list); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java index 760226c..afd2c6a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -24,11 +24,6 @@ public class DepartmentTreeQry { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - /** - * 名称模糊查询 - */ - @ApiModelProperty(value = "名称模糊查询", name = "likeName") - private String likeName; @ApiModelProperty(value = "企业id", name = "eqCorpInfoId") private String eqCorpInfoId; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 944790c..4ec093e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -1,6 +1,8 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +13,10 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:02:16 */ @Mapper +@DataScopes({ + @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), + @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") +}) public interface CorpInfoMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java index 9984e49..297e6be 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpQualificationInfoMapper.java @@ -1,6 +1,8 @@ package com.zcloud.basic.info.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.CorpQualificationInfoDO; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +13,10 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:02:46 */ @Mapper +@DataScopes({ + @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), + @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") +}) public interface CorpQualificationInfoMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java index 36a8f09..ab3577f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java @@ -13,9 +13,10 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-29 16:03:20 */ @Mapper -//@DataScopes( -// @DataScope(method = "selectPage", menuPerms = "open_platform_100012", tenantAlias = "tenant_id") -//) +@DataScopes({ + @DataScope(method = "selectList", menuPerms = "open_platform_100012", tenantAlias = "tenant_id"), + @DataScope(method = "selectPage", menuPerms = "open_platform_100013", tenantAlias = "tenant_id") +}) public interface DepartmentMapper extends BaseMapper { } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 187b662..6d4cca0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -5,6 +5,8 @@ import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; @@ -43,6 +45,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listTree(Map parmas) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + SSOUser ssoUser = AuthContext.getCurrentUser(); queryWrapper.orderByDesc("dep_order"); List departmentDOList = departmentMapper.selectList(queryWrapper); if (CollUtil.isEmpty(departmentDOList)) {