diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java index e1e8fd6f..9a70a625 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java @@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode; import org.nutz.dao.Cnd; import org.nutz.dao.util.cri.SqlExpressionGroup; +import java.util.List; + /** * @version 1.0 * @Author zzr @@ -22,11 +24,11 @@ public class MemberApplyPageForm extends PageForm { private String unitId; - private String userState; + private List userStates; - private String personType; + private List personTypes; - private String preparedBy; + private List preparedBys; public static void buildSearch(Cnd cnd, MemberApplyPageForm pageForm) { if (cnd == null) { @@ -40,8 +42,8 @@ public class MemberApplyPageForm extends PageForm { } cnd.andEX("info.unionId","=",pageForm.getUnionId()); cnd.andEX("info.unitId","=",pageForm.getUnitId()); - cnd.andEX("info.userState","=",pageForm.getUserState()); - cnd.andEX("info.personType","=",pageForm.getPersonType()); - cnd.andEX("info.preparedBy","=",pageForm.getPreparedBy()); + cnd.andEX("info.userState","in",pageForm.getUserStates()); + cnd.andEX("info.personType","in",pageForm.getPersonTypes()); + cnd.andEX("info.preparedBy","in",pageForm.getPreparedBys()); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java index f6ae3c32..7e095f10 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java @@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode; import org.nutz.dao.Cnd; import org.nutz.dao.util.cri.SqlExpressionGroup; +import java.util.List; + /** * @version 1.0 * @Author zzr @@ -29,15 +31,15 @@ public class MemberChangePageForm extends PageForm { // 在职状态 @ApiModelProperty("在职状态") - private String userState; + private List userStates; // 在职状态 @ApiModelProperty("编制类型") - private String preparedBy; + private List preparedBys; // 人员类型 @ApiModelProperty("人员类型") - private String personType; + private List personTypes; public void buildSearch(Cnd cnd, String prefix){ @@ -54,8 +56,8 @@ public class MemberChangePageForm extends PageForm { cnd.andEX(prefix + "unionId", "=", this.getUnionId()); cnd.andEX(prefix + "unitId", "=", this.getUnitId()); - cnd.andEX(prefix + "userState", "=", this.getUserState()); - cnd.andEX(prefix + "preparedBy", "=", this.getPreparedBy()); - cnd.andEX(prefix + "personType", "=", this.getPersonType()); + cnd.andEX(prefix + "userState", "in", this.getUserStates()); + cnd.andEX(prefix + "preparedBy", "in", this.getPreparedBys()); + cnd.andEX(prefix + "personType", "in", this.getPersonTypes()); } } diff --git a/src/main/resources/static/components/plugins/sysDict/DictSelect.vue b/src/main/resources/static/components/plugins/sysDict/DictSelect.vue index fbba3f2a..29d8c7e6 100644 --- a/src/main/resources/static/components/plugins/sysDict/DictSelect.vue +++ b/src/main/resources/static/components/plugins/sysDict/DictSelect.vue @@ -24,7 +24,7 @@