Merge remote-tracking branch 'origin/master_20240722' into master_20240722

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/renew/vo/RelationsRenewPageReqVO.java

@@ -41,6 +41,9 @@ public class RelationsRenewPageReqVO extends PageParam {
     @Schema(description = "部门uuid", example = "7043")
     private String deptUuid;
 
+    @Schema(description = "职位ID", example = "12361")
+    private Long postId;
+
     @Schema(description = "职位")
     private String position;
 

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/dal/mysql/renew/RelationsRenewMapper.java

@@ -28,6 +28,7 @@ public interface RelationsRenewMapper extends BaseMapperX<RelationsRenewDO> {
                 .eqIfPresent(RelationsRenewDO::getUserUuid, reqVO.getUserUuid())
                 .eqIfPresent(RelationsRenewDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(RelationsRenewDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(RelationsRenewDO::getPostId, reqVO.getPostId())
                 .eqIfPresent(RelationsRenewDO::getPosition, reqVO.getPosition())
                 .betweenIfPresent(RelationsRenewDO::getOldContractStartDate, reqVO.getOldContractStartDate())
                 .betweenIfPresent(RelationsRenewDO::getOldContractEndDate, reqVO.getOldContractEndDate())