diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index ea71c1c..fbffcc4 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -395,6 +395,7 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme $condition """); Cnd cnd = Cnd.NEW(); + cnd.and("t1.projectId","=",pageForm.getProjectId()); if (StrUtil.isNotBlank(pageForm.getUserName())) { cnd.where().andLike("t2.username", pageForm.getUserName()); } @@ -448,23 +449,23 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme cnd.where().andLike("u.username", pageForm.getUserName()); } if (StrUtil.isNotBlank(pageForm.getLoginName())) { - cnd.where().andLike("loginname", pageForm.getLoginName()); + cnd.where().andLike("u.loginname", pageForm.getLoginName()); } - cnd.andEX("sex", "=", pageForm.getSex()); - cnd.andEX("birthday", "=", pageForm.getBirthday()); + cnd.andEX("u.sex", "=", pageForm.getSex()); + cnd.andEX("u.birthday", "=", pageForm.getBirthday()); if (pageForm.getBirthMonths() != null && pageForm.getBirthMonths().length > 0) { - cnd.andEX("MONTH(birthday)", "in", pageForm.getBirthMonths()); + cnd.andEX("MONTH(u.birthday)", "in", pageForm.getBirthMonths()); } - cnd.andEX("unionId", "=", pageForm.getUnionId()); - cnd.andEX("unitId", "in", pageForm.getUnitIds()); - cnd.andEX("personType", "in", pageForm.getPersonTypes()); - cnd.andEX("preparedBy", "in", pageForm.getPreparedBys()); - cnd.andEX("userState", "in", pageForm.getUserStates()); + cnd.andEX("u.unionId", "=", pageForm.getUnionId()); + cnd.andEX("u.unitId", "in", pageForm.getUnitIds()); + cnd.andEX("u.personType", "in", pageForm.getPersonTypes()); + cnd.andEX("u.preparedBy", "in", pageForm.getPreparedBys()); + cnd.andEX("u.userState", "in", pageForm.getUserStates()); if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.asc("unionCode"); - cnd.asc("unitCode"); - cnd.asc("sex"); + cnd.asc("u.unionCode"); + cnd.asc("u.unitCode"); + cnd.asc("u.sex"); } else { cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); }