diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java index b11d64d..11a006f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.command.query; import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.command.convertor.UserCorpRecordCoConvertor; import com.zcloud.basic.info.dto.UserCorpRecordPageQry; import com.zcloud.basic.info.dto.clientobject.UserCO; @@ -38,6 +39,9 @@ public class UserCorpRecordQueryExe { * @return */ public PageResponse execute(UserCorpRecordPageQry userCorpRecordPageQry) { + if(userCorpRecordPageQry.getEqUserId() == null){ + userCorpRecordPageQry.setEqUserId(AuthContext.getUserId()); + } Map params = PageQueryHelper.toHashMap(userCorpRecordPageQry); PageResponse pageResponse = userCorpRecordRepository.listPage(params); List examCenterCOS = userCorpRecordCoConvertor.converDOsToCOs(pageResponse.getData()); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserCorpRecordPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserCorpRecordPageQry.java index 159a312..6a1ba41 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserCorpRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserCorpRecordPageQry.java @@ -28,7 +28,8 @@ public class UserCorpRecordPageQry extends PageQuery { */ @ApiModelProperty("不等于的入职状态,(就职企业传0),1-在职 0-离职, 11-入职待审核, 10-离职待审核") - @NotNull(message = "状态不能为空") private Integer neEmploymentFlag; + @ApiModelProperty("用户id") + private Long eqUserId; }