From c3db9628fd1bd1c39086f4d2bcc291bb6cb4b69b Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 23 Sep 2025 13:50:57 +0800
Subject: [PATCH] commit

---
 .../param/pageform/MemberApplyPageForm.java   | 14 +++++-----
 .../param/pageform/MemberChangePageForm.java  | 14 +++++-----
 .../components/plugins/sysDict/DictSelect.vue |  2 +-
 .../member/apply/common/commonQuery.js        | 22 ++++++++++-----
 .../member/apply/submit/index.html            |  4 +--
 .../branch/verification/check/index.html      |  2 +-
 .../member/change/common/commonQuery.js       | 27 ++++++++++---------
 .../member/change/common/memberChange.js      |  4 +--
 .../member/change/submit/form.html            |  4 +--
 .../member/change/submit/index.html           |  4 +--
 .../verification/check/schoolViewAndHandle.js |  2 +-
 .../verification/check/viewChangeTypeUser.js  |  2 +-
 .../manage/verificationSetUserList.js         |  2 +-
 .../manage/verificationShowSelectionUsers.js  |  2 +-
 .../sourcechange/manage/index.html            |  2 +-
 15 files changed, 60 insertions(+), 47 deletions(-)

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<String> userStates;
 
-    private String personType;
+    private List<String> personTypes;
 
-    private String preparedBy;
+    private List<String> 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<String> userStates;
 
     // 在职状态
     @ApiModelProperty("编制类型")
-    private String preparedBy;
+    private List<String> preparedBys;
 
     // 人员类型
     @ApiModelProperty("人员类型")
-    private String personType;
+    private List<String> 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 @@
 <script>
 module.exports = {
     props: {
-        value: { type: String },
+        value: { type: [String, Array] },
         code: {
             type: [String, Array],
             default: ""
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
index 3604b8d5..81d51ed0 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
@@ -24,13 +24,16 @@ const COMMON_QUERY = {
 				    </el-select>
 			    </search-item>
 			    <search-item label="在职状态">
-				    <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
+				    <dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
+				                 code="USER_STATE" multiple collapse-tags></dict-select>
 			    </search-item>
-			    <search-item label="聘用方式">
-				    <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
+			    <search-item label="人事编制">
+				    <dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
+				                 code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
 			    </search-item>
 			    <search-item label="人员类型">
-				    <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
+				    <dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
+				                 code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
 			    </search-item>
 		    </template>
 	    </search>
@@ -45,14 +48,19 @@ const COMMON_QUERY = {
                 searchKeyword: '',
                 unionId: '',
                 unitId: '',
-                userState: '',
-                personType: ''
+                userStates: [],
+                personTypes: [],
+                preparedBys: [],
             }
         }
     },
     methods: {
         doSearch(){
-            this.$emit('search', this.pageForm)
+            const pageForm = clone(this.pageForm)
+            pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+            pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
+            pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
+            this.$emit('search', pageForm)
         },
         async initData(){
             if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
index 78286e61..ec26b077 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
 				<el-descriptions-item label="性别">
 					<el-form-item prop="sex">
 						<el-radio-group v-model="formData.sex" size="small">
-							<el-radio border label="男性">男</el-radio>
-							<el-radio border label="女性">女</el-radio>
+							<el-radio border label="男">男</el-radio>
+							<el-radio border label="女">女</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-descriptions-item>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
index d93cbc50..6ada9754 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
                         <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
                     </search-item>
                     <search-item label="聘用方式">
-                        <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
+                        <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
index 77a8f7e6..294c1623 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
@@ -19,20 +19,16 @@ const COMMON_QUERY = {
 			    </el-select>
 		    </search-item>
 		    <search-item label="在职状态">
-			    <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
-			                 code="USER_STATE"></dict-select>
+			    <dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
+			                 code="USER_STATE" multiple collapse-tags></dict-select>
 		    </search-item>
 		    <search-item label="人事编制">
-			    <dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
-			                 code="PREPARED_BY"></dict-select>
+			    <dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
+			                 code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
 		    </search-item>
 		    <search-item label="人员类型">
-			    <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
-			                 code="USER_PERSON_TYPE"></dict-select>
-		    </search-item>
-		    <search-item label="变更类型">
-			    <dict-select v-model="pageForm.changeType" placeholder="人员类型" @change="doSearch"
-			                 code="MEMBER_CHANGE_TYPE"></dict-select>
+			    <dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
+			                 code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
 		    </search-item>
 	    </search>
     `,
@@ -45,14 +41,19 @@ const COMMON_QUERY = {
                 searchKeyword: '',
                 unionId: '',
                 unitId: '',
-                userState: '',
-                personType: ''
+                userStates: [],
+                personTypes: [],
+                preparedBys: [],
             }
         }
     },
     methods: {
         doSearch(){
-            this.$emit('search', this.pageForm)
+            const pageForm = clone(this.pageForm)
+            pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+            pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
+            pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
+            this.$emit('search', pageForm)
         },
         async initData(){
             if (this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN, SCHOOL_UNION_MEMBER_ADMIN")) {
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
index b5a2e032..67bc171f 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
@@ -18,8 +18,8 @@ const MEMBER_CHANGE = {
 			        <el-descriptions-item label="性别">
 				        <el-form-item prop="sex">
 					        <el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-						        <el-radio border label="男性">男</el-radio>
-						        <el-radio border label="女性">女</el-radio>
+						        <el-radio border label="男">男</el-radio>
+						        <el-radio border label="女">女</el-radio>
 					        </el-radio-group>
 				        </el-form-item>
 			        </el-descriptions-item>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
index 4c09a244..dc7ebebc 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
@@ -14,8 +14,8 @@
 			<el-descriptions-item label="性别">
 				<el-form-item prop="sex">
 					<el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-						<el-radio border label="男性">男</el-radio>
-						<el-radio border label="女性">女</el-radio>
+						<el-radio border label="男">男</el-radio>
+						<el-radio border label="女">女</el-radio>
 					</el-radio-group>
 				</el-form-item>
 			</el-descriptions-item>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
index 383abb8e..21a74401 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
 				<el-descriptions-item label="性别">
 					<el-form-item prop="sex">
 						<el-radio-group :disabled="allowFields('sex')" v-model="formData.sex" size="small">
-							<el-radio border label="男性">男</el-radio>
-							<el-radio border label="女性">女</el-radio>
+							<el-radio border label="男">男</el-radio>
+							<el-radio border label="女">女</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-descriptions-item>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
index e866f0ae..4e5e6b3c 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
@@ -21,7 +21,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
                 </search-item>
                 <search-item label="聘用方式">
                     <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                 code="PREPARED_BY"></dict-select>
+                                 code="USER_PREPARED_BY_TYPE"></dict-select>
                 </search-item>
                 <search-item label="人员类型">
                     <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
index 054c8af0..f01a0f08 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
@@ -19,7 +19,7 @@ const VIEW_CHANGE_TYPE_USER = {
                     </search-item>
                     <search-item label="聘用方式">
                         <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
index e5d5d4ca..f91e9825 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
@@ -34,7 +34,7 @@ const VERIFICATION_SET_USER_LIST = {
                     </search-item>
                     <search-item label="聘用方式">
                         <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="变更类型">
                         <dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
index 2bc3e5ed..28c77f90 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
@@ -28,7 +28,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
                             </search-item>
                             <search-item label="聘用方式">  
                                 <dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
-                                             code="PREPARED_BY"></dict-select>
+                                             code="USER_PREPARED_BY_TYPE"></dict-select>
                             </search-item>
                             <search-item label="人员类型">
                                 <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
index 037140f5..263d8113 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
                     </search-item>
                     <search-item label="人事编制">
                         <dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
-                                     code="PREPARED_BY"></dict-select>
+                                     code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
                     <search-item label="人员类型">
                         <dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"