|
|
|
@ -382,6 +382,7 @@ public class CoreHqlPack {
|
|
|
|
|
HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
|
|
|
|
|
HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
|
|
|
|
|
HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
|
|
|
|
|
HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
|
|
|
|
|
if(user.getRoleIdList() != null){
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
|
|
|
|
@ -493,6 +494,7 @@ public class CoreHqlPack {
|
|
|
|
|
// HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
|
|
|
|
|
HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
|
|
|
|
|
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
|
|
|
|
|
HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
|
|
|
|
|
if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
|
|
|
|
|