diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java index 34239d8..21e35bd 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java @@ -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); diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index ea73520..a1ab564 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -115,10 +115,12 @@ layout("/mobile/platform.html"){ } .optionDesc { + margin-top: -16px; display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 3; + /*-webkit-box-orient: vertical;*/ + /*-webkit-line-clamp: 3;*/ overflow: hidden; + white-space: pre-line; text-overflow: ellipsis; font-size: 13px; color: #868282; @@ -219,7 +221,7 @@ layout("/mobile/platform.html"){ v-for="(subject,sidx) in projectInfo.welfareProjectSubjects">