修改请求相关方代码

web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java

@@ -89,8 +89,8 @@ public class DepartmentController {
     }
     @ApiOperation("部门树状所有数据")
     @PostMapping("/listTree")
-    public List<DepartmentTreeInfoCO> listTree(@Validated @RequestBody DepartmentTreeQry qry) {
+    public MultiResponse<DepartmentTreeInfoCO> listTree(@Validated @RequestBody DepartmentTreeQry qry) {
-        return departmentService.listTree(qry);
+        return MultiResponse.of(departmentService.listTree(qry));
     }
 
 

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());

web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java

@@ -52,8 +52,6 @@ public class CorpInfoQueryExe {
         PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(parmas);
         List<CorpInfoCO> 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<CorpDepartmentE> corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData());
         corpInfoList.forEach(corpInfo -> {
             Map<String, Object> departParmas = new HashMap<>();
-            departParmas.put("eqCorpinfoId",corpInfo.getId());
+            departParmas.put("eqId",corpInfo.getId());
             List<DepartmentDO> list = departmentRepository.listByParams(departParmas);
             List<DepartmentE> departmentES = corpInfoCoConvertor.converDOsToDepartE(list);
 

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;

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<CorpInfoDO> {
 
 }

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<CorpQualificationInfoDO> {
 
 }

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(
+@DataScopes({
-//        @DataScope(method = "selectPage", menuPerms = "open_platform_100012", tenantAlias = "tenant_id")
+        @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<DepartmentDO> {
 
 }

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<DepartmentMappe
     public List<DepartmentDO> listTree(Map<String, Object> parmas) {
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
+        SSOUser ssoUser = AuthContext.getCurrentUser();
         queryWrapper.orderByDesc("dep_order");
         List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
         if (CollUtil.isEmpty(departmentDOList)) {