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

dev:岗位管理-代码修改

main
SondonYong 2025-11-05 10:25:56 +08:00
parent d7e75502ea
commit da84291f31
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java
View File

@ -9,7 +9,6 @@ import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.model.SSOUser;
import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.auth.utils.AuthContext;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -17,7 +16,6 @@ import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
/** /**
* web-adapter * web-adapter

5
web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway; import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway;
import com.zcloud.basic.info.domain.gateway.PostGateway; import com.zcloud.basic.info.domain.gateway.PostGateway;
import com.alibaba.cola.exception.BizException; import com.alibaba.cola.exception.BizException;
import com.zcloud.basic.info.domain.gateway.UserGateway;
import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.dataobject.UserDO;
import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.basic.info.persistence.repository.UserRepository;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -29,7 +28,7 @@ public class PostRemoveExe {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) { public boolean execute(Long id) {
// 校验是否有人员使用该岗位 // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("post_id", id); queryWrapper.eq("post_id", id);
queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.eq("delete_enum", "FALSE");
@ -53,7 +52,7 @@ public class PostRemoveExe {
throw new BizException("岗位ID不能为空"); throw new BizException("岗位ID不能为空");
} }
// 校验是否有人员使用该岗位 // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位
QueryWrapper<UserDO> queryWrapper = new QueryWrapper(); QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
queryWrapper.in("post_id", ids); queryWrapper.in("post_id", ids);
queryWrapper.eq("delete_enum", "FALSE"); queryWrapper.eq("delete_enum", "FALSE");

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

@ -41,7 +41,7 @@ public class PostListQry {
// 部门id // 部门id
private Long departmentId; private Long departmentId;
@ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true) @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
// 企业id // 企业id
private Long corpinfoId; private Long corpinfoId;
} }

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

@ -27,21 +27,21 @@ public class PostPageQry extends PageQuery {
* - `ne`: 不等比较查询，对应SQL的!=操作符 * - `ne`: 不等比较查询，对应SQL的!=操作符
*/ */
@ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "departmentId", required = true) @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true)
@NotNull(message = "监管端/企业端标识不能为空") @NotNull(message = "监管端/企业端标识不能为空")
// 监管端/企业端标识,1-监管端, 2-企业端 // 监管端/企业端标识,1-监管端, 2-企业端
private Integer corpFlag; private Integer corpFlag;
@ApiModelProperty(value = "部门id", name = "departmentId", required = true) @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true)
@NotNull(message = "部门id不能为空") @NotNull(message = "部门id不能为空")
// 部门id // 部门id
private Long eqDepartmentId; private Long eqDepartmentId;
@ApiModelProperty(value = "企业id", name = "departmentId") @ApiModelProperty(value = "企业id", name = "eqCorpinfoId")
// 企业id // 企业id
private Long eqCorpinfoId; private Long eqCorpinfoId;
@ApiModelProperty(value = "岗位名称", name = "departmentId") @ApiModelProperty(value = "岗位名称", name = "likePostName")
// 岗位名称 // 岗位名称
private String likePostName; private String likePostName;