Merge remote-tracking branch 'origin/main' into main

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/CorpInfoAddCmd.java

@@ -46,9 +46,6 @@ public class CorpInfoAddCmd extends Command {
     private String postalCode;
     @ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
     private String companyArea;
-    @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate firstServeDate;
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String scale;
     @ApiModelProperty(value = "规模名称", name = "scaleName", required = true)
@@ -68,10 +65,7 @@ public class CorpInfoAddCmd extends Command {
     private String addressBusiness;
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
-    @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
+
-    private BigDecimal fixedAssets;
-    @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
     @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java

@@ -49,9 +49,7 @@ public class CorpInfoUpdateCmd extends Command {
     private String postalCode;
     @ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
     private String companyArea;
-    @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
+
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate firstServeDate;
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String scale;
     @ApiModelProperty(value = "规模名称", name = "scaleName", required = true)
@@ -71,10 +69,7 @@ public class CorpInfoUpdateCmd extends Command {
     private String addressBusiness;
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
-    @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
+
-    private BigDecimal fixedAssets;
-    @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
     @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoXgfUpdateCmd.java

@@ -50,9 +50,6 @@ public class CorpInfoXgfUpdateCmd extends Command {
     private String postalCode;
     @ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
     private String companyArea;
-    @ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate firstServeDate;
     @ApiModelProperty(value = "规模", name = "scale", required = true)
     private String scale;
     @ApiModelProperty(value = "规模名称", name = "scaleName", required = true)
@@ -72,10 +69,6 @@ public class CorpInfoXgfUpdateCmd extends Command {
     private String addressBusiness;
     @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
     private String addressOffice;
-    @ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
-    private BigDecimal fixedAssets;
-    @ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
-    private BigDecimal yearOutputValue;
     @ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
     private String ecoType;
     @ApiModelProperty(value = "经济类型名称", name = "ecoTypeName", required = true)

web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java

@@ -31,12 +31,7 @@ public class DepartmentAddCmd extends Command {
     @ApiModelProperty(value = "父部门id", name = "parentId", required = true)
     @NotNull(message = "父部门id不能为空")
     private Long parentId;
-    @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true)
+
-    private String headman;
-    @ApiModelProperty(value = "负责人手机号", name = "phone", required = true)
-    private String phone;
-    @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true)
-    private String address;
     @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true)
     private Long corpinfoId;
     @ApiModelProperty(value = "部门级别编码", name = "level", required = true)
@@ -47,22 +42,6 @@ public class DepartmentAddCmd extends Command {
     private Integer depOrder;
     @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "isSupervise", required = true)
     private Integer isSupervise;
-    @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true)
-    private Integer state;
-    @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true)
-    private String leaderCharge;
-    @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true)
-    private String lrman;
-    @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true)
-    private Integer category;
-    @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true)
-    private String deptTypeName;
-    @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true)
-    private String deptType;
-    @ApiModelProperty(value = "部门类型编码", name = "type", required = true)
-    private String type;
-    @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true)
-    private String typeName;
 
 }
 

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-client/src/main/java/com/zcloud/basic/info/dto/DepartmentUpdateCmd.java

@@ -32,12 +32,7 @@ public class DepartmentUpdateCmd extends Command {
     private String name;
     @ApiModelProperty(value = "父部门id", name = "parentId", required = true)
     private Long parentId;
-    @ApiModelProperty(value = "负责人,汉字6以内", name = "headman", required = true)
+
-    private String headman;
-    @ApiModelProperty(value = "负责人手机号", name = "phone", required = true)
-    private String phone;
-    @ApiModelProperty(value = "地址,汉字80以内", name = "address", required = true)
-    private String address;
     @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true)
     private Long corpinfoId;
     @ApiModelProperty(value = "部门级别编码", name = "level", required = true)
@@ -48,22 +43,7 @@ public class DepartmentUpdateCmd extends Command {
     private Integer depOrder;
     @ApiModelProperty(value = "是否监管部门 0-否  1-是", name = "isSupervise", required = true)
     private Integer isSupervise;
-    @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门", name = "state", required = true)
+
-    private Integer state;
-    @ApiModelProperty(value = "主管领导,汉字6以内", name = "leaderCharge", required = true)
-    private String leaderCharge;
-    @ApiModelProperty(value = "分管领导人,汉字6以内", name = "lrman", required = true)
-    private String lrman;
-    @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管", name = "category", required = true)
-    private Integer category;
-    @ApiModelProperty(value = "单位类型名称,汉字30以内", name = "deptTypeName", required = true)
-    private String deptTypeName;
-    @ApiModelProperty(value = "单位类型编码", name = "deptType", required = true)
-    private String deptType;
-    @ApiModelProperty(value = "部门类型编码", name = "type", required = true)
-    private String type;
-    @ApiModelProperty(value = "部门类型名称,汉字30以内", name = "typeName", required = true)
-    private String typeName;
 
 }
 

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java

@@ -50,9 +50,7 @@ public class CorpInfoCO extends ClientObject {
     //所属区域
     @ApiModelProperty(value = "所属区域")
     private String companyArea;
-    //开始服务日期
+
-    @ApiModelProperty(value = "开始服务日期")
-    private LocalDate firstServeDate;
     //规模
     @ApiModelProperty(value = "规模")
     private String scale;
@@ -79,12 +77,6 @@ public class CorpInfoCO extends ClientObject {
     //企事业单位办公地址
     @ApiModelProperty(value = "企事业单位办公地址")
     private String addressOffice;
-    //固定资产
-    @ApiModelProperty(value = "固定资产")
-    private BigDecimal fixedAssets;
-    //年产值
-    @ApiModelProperty(value = "年产值")
-    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoXgfCO.java

@@ -52,9 +52,6 @@ public class CorpInfoXgfCO extends ClientObject {
     //所属区域
     @ApiModelProperty(value = "所属区域")
     private String companyArea;
-    //开始服务日期
-    @ApiModelProperty(value = "开始服务日期")
-    private LocalDate firstServeDate;
     //规模
     @ApiModelProperty(value = "规模")
     private String scale;
@@ -81,12 +78,6 @@ public class CorpInfoXgfCO extends ClientObject {
     //企事业单位办公地址
     @ApiModelProperty(value = "企事业单位办公地址")
     private String addressOffice;
-    //固定资产
-    @ApiModelProperty(value = "固定资产")
-    private BigDecimal fixedAssets;
-    //年产值
-    @ApiModelProperty(value = "年产值")
-    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;

web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentCO.java

@@ -27,15 +27,6 @@ public class DepartmentCO extends ClientObject {
     //父部门id
     @ApiModelProperty(value = "父部门id")
     private Long parentId;
-    //负责人
-    @ApiModelProperty(value = "负责人")
-    private String headman;
-    //负责人手机号
-    @ApiModelProperty(value = "负责人手机号")
-    private String phone;
-    //地址
-    @ApiModelProperty(value = "地址")
-    private String address;
     //所属企业
     @ApiModelProperty(value = "所属企业")
     private Long corpinfoId;
@@ -51,30 +42,7 @@ public class DepartmentCO extends ClientObject {
     //是否监管部门 0-否  1-是
     @ApiModelProperty(value = "是否监管部门 0-否  1-是")
     private Integer isSupervise;
-    //0安监部门1消防部门
+
-    @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门")
-    private Integer state;
-    //主管领导
-    @ApiModelProperty(value = "主管领导")
-    private String leaderCharge;
-    //分管领导人
-    @ApiModelProperty(value = "分管领导人")
-    private String lrman;
-    //部门类别:1.行业监管 2.综合监管
-    @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管")
-    private Integer category;
-    //单位类型名称
-    @ApiModelProperty(value = "单位类型名称")
-    private String deptTypeName;
-    //单位类型编码
-    @ApiModelProperty(value = "单位类型编码")
-    private String deptType;
-    //部门类型编码
-    @ApiModelProperty(value = "部门类型编码")
-    private String type;
-    //部门类型名称
-    @ApiModelProperty(value = "部门类型名称")
-    private String typeName;
     //乐观锁
     @ApiModelProperty(value = "乐观锁")
     private Integer version;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java

@@ -43,8 +43,6 @@ public class CorpInfoE extends BaseE {
     private String postalCode;
     //所属区域
     private String companyArea;
-    //开始服务日期
-    private LocalDate firstServeDate;
     //规模
     private String scale;
     //规模名称
@@ -63,10 +61,6 @@ public class CorpInfoE extends BaseE {
     private String addressBusiness;
     //企事业单位办公地址
     private String addressOffice;
-    //固定资产
-    private BigDecimal fixedAssets;
-    //年产值
-    private BigDecimal yearOutputValue;
     //经济类型
     private String ecoType;
     private String ecoTypeName;

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoXgfE.java

@@ -37,8 +37,7 @@ public class CorpInfoXgfE extends BaseE {
     private String postalCode;
     //所属区域
     private String companyArea;
-    //开始服务日期
+
-    private LocalDate firstServeDate;
     //规模
     private String scale;
     //规模名称
@@ -57,10 +56,7 @@ public class CorpInfoXgfE extends BaseE {
     private String addressBusiness;
     //企事业单位办公地址
     private String addressOffice;
-    //固定资产
+
-    private BigDecimal fixedAssets;
-    //年产值
-    private BigDecimal yearOutputValue;
     //经济类型
     private String ecoType;
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java

@@ -25,12 +25,6 @@ public class DepartmentE extends BaseE {
     private String name;
     //父部门id
     private Long parentId;
-    //负责人
-    private String headman;
-    //负责人手机号
-    private String phone;
-    //地址
-    private String address;
     //所属企业
     private Long corpinfoId;
     //部门级别编码
@@ -41,22 +35,6 @@ public class DepartmentE extends BaseE {
     private Integer depOrder;
     //是否监管部门 0-否  1-是
     private Integer isSupervise;
-    //安全管理部门,0安监部门1消防部门
-    private Integer state;
-    //主管领导
-    private String leaderCharge;
-    //分管领导人
-    private String lrman;
-    //部门类别:1.行业监管 2.综合监管
-    private Integer category;
-    //单位类型名称
-    private String deptTypeName;
-    //单位类型编码
-    private String deptType;
-    //部门类型编码
-    private String type;
-    //部门类型名称
-    private String typeName;
 
 
 }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java

@@ -56,9 +56,7 @@ public class CorpInfoDO extends BaseDO {
     //所属区域
     @ApiModelProperty(value = "所属区域")
     private String companyArea;
-    //开始服务日期
+
-    @ApiModelProperty(value = "开始服务日期")
-    private LocalDate firstServeDate;
     //规模
     @ApiModelProperty(value = "规模")
     private String scale;
@@ -85,12 +83,6 @@ public class CorpInfoDO extends BaseDO {
     //企事业单位办公地址
     @ApiModelProperty(value = "企事业单位办公地址")
     private String addressOffice;
-    //固定资产
-    @ApiModelProperty(value = "固定资产")
-    private BigDecimal fixedAssets;
-    //年产值
-    @ApiModelProperty(value = "年产值")
-    private BigDecimal yearOutputValue;
     //经济类型
     @ApiModelProperty(value = "经济类型")
     private String ecoType;

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java

@@ -30,15 +30,6 @@ public class DepartmentDO extends BaseDO {
     //父部门id
     @ApiModelProperty(value = "父部门id")
     private Long parentId;
-    //负责人
-    @ApiModelProperty(value = "负责人")
-    private String headman;
-    //负责人手机号
-    @ApiModelProperty(value = "负责人手机号")
-    private String phone;
-    //地址
-    @ApiModelProperty(value = "地址")
-    private String address;
     //所属企业
     @ApiModelProperty(value = "所属企业")
     private Long corpinfoId;
@@ -54,30 +45,6 @@ public class DepartmentDO extends BaseDO {
     //是否监管部门 0-否  1-是
     @ApiModelProperty(value = "是否监管部门 0-否  1-是")
     private Integer isSupervise;
-    //0安监部门1消防部门
-    @ApiModelProperty(value = "安全管理部门,0安监部门1消防部门")
-    private Integer state;
-    //主管领导
-    @ApiModelProperty(value = "主管领导")
-    private String leaderCharge;
-    //分管领导人
-    @ApiModelProperty(value = "分管领导人")
-    private String lrman;
-    //部门类别:1.行业监管 2.综合监管
-    @ApiModelProperty(value = "部门类别:1.行业监管 2.综合监管")
-    private Integer category;
-    //单位类型名称
-    @ApiModelProperty(value = "单位类型名称")
-    private String deptTypeName;
-    //单位类型编码
-    @ApiModelProperty(value = "单位类型编码")
-    private String deptType;
-    //部门类型编码
-    @ApiModelProperty(value = "部门类型编码")
-    private String type;
-    //部门类型名称
-    @ApiModelProperty(value = "部门类型名称")
-    private String typeName;
 
 }
 

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)) {