Merge remote-tracking branch 'origin/master'

mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java

@@ -83,6 +83,7 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         queryWrapper.eq(StrUtil.isNotBlank(searchValidate.getEmpNo()), "u.emp_no", StrUtil.trim(searchValidate.getEmpNo()))
                 .like(StrUtil.isNotBlank(searchValidate.getName()), "u.name", searchValidate.getName())
                 .like(StrUtil.isNotBlank(searchValidate.getIdCode()), "u.id_code", searchValidate.getIdCode())
+                .eq(StrUtil.isNotBlank(searchValidate.getPost()), "u.post_ids", searchValidate.getPost())
                 .eq(Objects.nonNull(searchValidate.getRole()), "u.role_ids", searchValidate.getRole())
                 .eq(StrUtil.isNotBlank(searchValidate.getDeptId()), "u.dept_ids", searchValidate.getDeptId());
         Integer roleId = AdminThreadLocal.getRoleId();

mailbox-lan/src/main/java/com/biutag/lan/validate/system/PoliceUserSearchValidate.java

@@ -27,6 +27,9 @@ public class PoliceUserSearchValidate implements Serializable {
     @ApiModelProperty(value = "角色ID")
     private Integer role;
 
+    @ApiModelProperty(value = "职位ID")
+    private String post;
+
     @ApiModelProperty(value = "部门ID")
     private String deptId;