diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java index bb0b700..ef3b9f0 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java @@ -27,11 +27,6 @@ public class PostListQry { * - `ne`: 不等比较查询,对应SQL的!=操作符 */ - @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true) - @NotNull(message = "监管端/企业端标识不能为空") - // 监管端/企业端标识,1-监管端, 2-企业端 - private Integer corpFlag; - @ApiModelProperty(value = "主键id集合", name = "postIds") // 主键id集合 private Long[] postIds; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java index 5a31460..4c3bf5a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java @@ -28,10 +28,6 @@ public class PostPageQry extends PageQuery { * - `ne`: 不等比较查询,对应SQL的!=操作符 */ - @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true) - @NotNull(message = "监管端/企业端标识不能为空") - // 监管端/企业端标识,1-监管端, 2-企业端 - private Integer corpFlag; @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true) @NotNull(message = "部门id不能为空") diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java index 1c8ad5c..ffce40a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.persistence.repository.impl; import com.alibaba.cola.dto.MultiResponse; +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.zcloud.basic.info.persistence.dataobject.DepartmentDO; @@ -35,11 +36,15 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i @Override public PageResponse listPage(Map params) { - // 企业端 - Integer corpFlag = (Integer)params.get("corpFlag"); - if(corpFlag == 2){ + if(params.get("eqCorpinfoId") == null){ params.put("eqCorpinfoId", AuthContext.getTenantId()); } + if(params.get("eqDepartmentId") != null){ + Long eqDepartmentId = (Long) params.get("eqDepartmentId"); + if(eqDepartmentId == 0){ + params.put("eqDepartmentId", null); + } + } IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -52,10 +57,8 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i @Override public MultiResponse list(Map params) { - // 企业端 - Integer corpFlag = (Integer)params.get("corpFlag"); - if(corpFlag == 2){ - params.put("corpinfoId", AuthContext.getTenantId()); + if(params.get("eqCorpinfoId") == null){ + params.put("eqCorpinfoId", AuthContext.getTenantId()); } Long[] ids = (Long[])params.get("postIds");