修改用户查询条件参数类型并添加在职状态过滤
parent
e269ab1399
commit
94c2c1847b
|
|
@ -26,12 +26,13 @@ public class UserQryCmd {
|
||||||
private String eqCorpinfoId;
|
private String eqCorpinfoId;
|
||||||
private String eqDepartmentId;
|
private String eqDepartmentId;
|
||||||
private String eqPostId;
|
private String eqPostId;
|
||||||
private Integer eqEmploymentFlag;
|
private String eqEmploymentFlag;
|
||||||
|
|
||||||
private Long corpinfoId;
|
private Long corpinfoId;
|
||||||
private Long departmentId;
|
private Long departmentId;
|
||||||
private Long postId;
|
private Long postId;
|
||||||
private String username;
|
private String username;
|
||||||
private Integer noMain;
|
private Integer noMain;
|
||||||
|
private String isMyCorp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -141,8 +141,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
// List<Long> ids = new ArrayList<>();
|
// List<Long> ids = new ArrayList<>();
|
||||||
// ids.add(1999009782763397120L);
|
// ids.add(1999009782763397120L);
|
||||||
// Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
|
// Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
|
||||||
|
if (!ObjectUtils.isEmpty(params.get("eqEmploymentFlag"))){
|
||||||
if (ObjectUtils.isEmpty(params.get("corpinfoId"))) {
|
params.put("employmentFlag", params.get("eqEmploymentFlag"));
|
||||||
|
}
|
||||||
|
if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
|
||||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||||
params.put("corpinfoId", ssoUser.getTenantId());
|
params.put("corpinfoId", ssoUser.getTenantId());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,11 @@
|
||||||
<if test="params.departmentId != null">
|
<if test="params.departmentId != null">
|
||||||
and u.department_id = #{params.departmentId}
|
and u.department_id = #{params.departmentId}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="params.employmentFlag != null">
|
||||||
|
and u.employment_flag = #{params.employmentFlag}
|
||||||
|
</if>
|
||||||
|
|
||||||
|
|
||||||
<if test="params.postId != null">
|
<if test="params.postId != null">
|
||||||
and u.post_id = #{params.postId}
|
and u.post_id = #{params.postId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue