This commit is contained in:
Paidax
2025-01-09 09:36:04 +08:00
parent 9e65417d6e
commit f99ebdfff6
5 changed files with 54 additions and 20 deletions
@@ -94,6 +94,7 @@ public class WelfareListController {
@Param(value = "projectId", required = false) String projectId,
@Param(value = "optionId", required = false) String optionId,
@Param(value = "month", required = false) String month,
@Param(value = "isChoose", required = false) Integer isChoose,
@Param(value = "courierNumber", required = false) String courierNumber
) {
Sql sql = Sqls.create("""
@@ -133,6 +134,14 @@ public class WelfareListController {
cnd.andEX("wl.unionid", "=", pageParam.getWelfareUnit());
cnd.andEX("wl.unitid", "=", pageParam.getUnit());
if (isChoose != null) {
if (isChoose.equals(1)) {
cnd.and("wus.selectUserId", "is not", null);
} else if (isChoose.equals(2)) {
cnd.and("wus.selectUserId", "is", null);
}
}
if (Lang.isNotEmpty(pageParam.getPersonTypes())) {
String personTypes = pageParam.getPersonTypes();
String[] personTypeArray = Json.fromJsonAsArray(String.class, personTypes);