mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 05:42:06 +08:00
用户、部门、岗位、查询添加组织id参数
This commit is contained in:
+2
@@ -36,4 +36,6 @@ public class DeptRespVO {
|
|||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
private Long organId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -19,4 +19,6 @@ public class PostPageReqVO extends PageParam {
|
|||||||
@Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
|
@Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
|
private Long organId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -42,4 +42,5 @@ public class PostRespVO {
|
|||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
private Long organId;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -47,4 +47,6 @@ public class UserPageReqVO extends PageParam {
|
|||||||
*/
|
*/
|
||||||
private String pyAll;
|
private String pyAll;
|
||||||
|
|
||||||
|
private Long organId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -72,4 +72,6 @@ public class UserRespVO{
|
|||||||
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
private Long organId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -5,6 +5,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
|
|||||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.cf.imes.framework.organ.core.db.OrganBaseDO;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
@@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
|
|||||||
@KeySequence("system_post_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
@KeySequence("system_post_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class PostDO extends BaseDO {
|
public class PostDO extends OrganBaseDO {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 岗位序号
|
* 岗位序号
|
||||||
|
|||||||
+1
@@ -21,6 +21,7 @@ public interface PostMapper extends BaseMapperX<PostDO> {
|
|||||||
|
|
||||||
default PageResult<PostDO> selectPage(PostPageReqVO reqVO) {
|
default PageResult<PostDO> selectPage(PostPageReqVO reqVO) {
|
||||||
return selectPage(reqVO, new LambdaQueryWrapperX<PostDO>()
|
return selectPage(reqVO, new LambdaQueryWrapperX<PostDO>()
|
||||||
|
.eqIfPresent(PostDO::getOrganId, reqVO.getOrganId())
|
||||||
.likeIfPresent(PostDO::getCode, reqVO.getCode())
|
.likeIfPresent(PostDO::getCode, reqVO.getCode())
|
||||||
.likeIfPresent(PostDO::getName, reqVO.getName())
|
.likeIfPresent(PostDO::getName, reqVO.getName())
|
||||||
.eqIfPresent(PostDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(PostDO::getStatus, reqVO.getStatus())
|
||||||
|
|||||||
+1
@@ -34,6 +34,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
|
|||||||
|
|
||||||
default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
|
||||||
return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
|
||||||
|
.eqIfPresent(AdminUserDO::getOrganId, reqVO.getOrganId())
|
||||||
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
|
||||||
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
|
||||||
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
|
||||||
|
|||||||
Reference in New Issue
Block a user