diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java index 3f270aa..7635d20 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java @@ -9,7 +9,6 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +16,6 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; /** * web-adapter diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java index 2341637..370051c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java @@ -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.PostGateway; 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.repository.UserRepository; import lombok.AllArgsConstructor; @@ -29,7 +28,7 @@ public class PostRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - // 校验是否有人员使用该岗位 + // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("post_id", id); queryWrapper.eq("delete_enum", "FALSE"); @@ -53,7 +52,7 @@ public class PostRemoveExe { throw new BizException("岗位ID不能为空"); } - // 校验是否有人员使用该岗位 + // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("post_id", ids); queryWrapper.eq("delete_enum", "FALSE"); 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 b11bad0..8dc43c1 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 @@ -41,7 +41,7 @@ public class PostListQry { // 部门id private Long departmentId; - @ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true) + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) // 企业id private Long corpinfoId; } 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 8a41cbf..c3b1e0a 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 @@ -27,21 +27,21 @@ public class PostPageQry extends PageQuery { * - `ne`: 不等比较查询,对应SQL的!=操作符 */ - @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "departmentId", required = true) + @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true) @NotNull(message = "监管端/企业端标识不能为空") // 监管端/企业端标识,1-监管端, 2-企业端 private Integer corpFlag; - @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true) @NotNull(message = "部门id不能为空") // 部门id private Long eqDepartmentId; - @ApiModelProperty(value = "企业id", name = "departmentId") + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") // 企业id private Long eqCorpinfoId; - @ApiModelProperty(value = "岗位名称", name = "departmentId") + @ApiModelProperty(value = "岗位名称", name = "likePostName") // 岗位名称 private String likePostName;