zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:2a8632f93ce5225e7bbbecdf72637ec0561e03b4
Branches Tags
zcloud_gbs:main
..
compare: zcloud_gbs:79f0b075dc0c170047c3e62dcdf361ff4769ea08
Branches Tags
zcloud_gbs:main

No commits in common. "2a8632f93ce5225e7bbbecdf72637ec0561e03b4" and "79f0b075dc0c170047c3e62dcdf361ff4769ea08" have entirely different histories.
2a8632f93c ... 79f0b075dc

4 changed files with 16 additions and 11 deletions
Show Stats Expand all files Collapse all files

5
web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java
View File

@ -27,6 +27,11 @@ 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;

4
web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java
View File

@ -28,6 +28,10 @@ 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不能为空")

1
web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java
View File

@ -93,7 +93,6 @@ public class UserAddCmd extends Command {
@ApiModelProperty(value = "描述", name = "remarks")
private String remarks;
@ApiModelProperty(value = "是否部门领导0否1是", name = "departmentLeaderFlag")
@NotNull(message = "是否部门领导不能为空")
private Integer departmentLeaderFlag;
@ApiModelProperty(value = "是否分管领导0否1是", name = "deputyLeaderFlag")

17
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java
View File

@ -1,7 +1,6 @@
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;
@ -36,15 +35,11 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
@Override
public PageResponse<PostDO> listPage(Map<String, Object> params) {
if(params.get("eqCorpinfoId") == null){
// 企业端
Integer corpFlag = (Integer)params.get("corpFlag");
if(corpFlag == 2){
params.put("eqCorpinfoId", AuthContext.getTenantId());
}
if(params.get("eqDepartmentId") != null){
Long eqDepartmentId = (Long) params.get("eqDepartmentId");
if(eqDepartmentId == 0){
params.put("eqDepartmentId", null);
}
}
IPage<PostDO> iPage = new Query<PostDO>().getPage(params);
QueryWrapper<PostDO> queryWrapper = new QueryWrapper<>();
@ -57,8 +52,10 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
@Override
public MultiResponse<PostDO> list(Map<String, Object> params) {
if(params.get("eqCorpinfoId") == null){
params.put("eqCorpinfoId", AuthContext.getTenantId());
// 企业端
Integer corpFlag = (Integer)params.get("corpFlag");
if(corpFlag == 2){
params.put("corpinfoId", AuthContext.getTenantId());
}
Long[] ids = (Long[])params.get("postIds");