|
|
|
@ -524,10 +524,13 @@ public class CoreHqlPack {
|
|
|
|
|
DdlPackBean result = DdlPackBean.getDdlPackBean(user);
|
|
|
|
|
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
|
|
|
|
|
DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
|
|
|
|
|
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
|
|
|
|
|
DdlPreparedPack.getInPackList(idList,"id",result);
|
|
|
|
|
result.setOrderByStr(user.orderBy());
|
|
|
|
@ -651,6 +654,10 @@ public class CoreHqlPack {
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
|
|
|
|
|
DdlPreparedPack.getInPackList(idList,"id",result);
|
|
|
|
|
|
|
|
|
|
if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
|
|
|
|
|
DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Like
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
|
|
|
|
|
DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
|
|
|
|
|