diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index a2dbfa90..b98dd8d6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -46,6 +46,8 @@ public class UserPageQry extends PageQuery { private String eqPersonnelType; @ApiModelProperty(value = "身份证号") private String likeUserIdCard; + @ApiModelProperty(value = "是否流动人员,1-流动,0-固定人员") + private String eqFlowFlag; private String menuPath; diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 65e5e99a..0b97ff71 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -148,6 +148,7 @@ u.political_affiliation, u.political_affiliation_name, u.employment_flag, + u.flow_flag, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN