【issues/9275】用户组件第二次点击取消时勾选值还是回显了

同步钉钉部门报错 #9228
--author:scott--date:20260108--for:升级minidao版本至1.10.18
2026-02-02 00:25:22 +08:00 · 2026-01-20 12:02:54 +08:00 · 2026-01-09 14:39:15 +08:00 · 2026-01-08 16:20:28 +08:00 · 2025-12-31 16:43:12 +08:00 · 2025-12-26 10:54:38 +08:00
11 changed files with 92 additions and 35 deletions
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
@ -229,7 +229,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
                LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>();
                // 根据 source_identifier 字段查询
                // 代码逻辑说明: 【issues/6017】钉钉同步部门时没有最顶层的部门名，同步用户时，用户没有部门信息---
-                queryWrapper.and(item -> item.eq(SysDepart::getId, departmentTree.getSource_identifier()).or().eq(SysDepart::getDingIdentifier,departmentTree.getDept_id()));
+                queryWrapper.and(item -> item.eq(SysDepart::getId, departmentTree.getSource_identifier()).or().eq(SysDepart::getDingIdentifier,oConvertUtils.getString(departmentTree.getDept_id())));
                SysDepart sysDepart = sysDepartService.getOne(queryWrapper);
                if (sysDepart != null) {
                    //  执行更新操作
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -355,13 +355,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -381,13 +381,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+    <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -350,13 +350,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
@ -686,7 +692,10 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    <#elseif po.classType=='list' || po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -351,13 +351,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
@ -672,13 +678,19 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -351,13 +351,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
@ -599,13 +605,19 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+      <#if po.fieldDbType=='int'>
+        stringToNumber: true
+      </#if>
     },
    <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -351,13 +351,19 @@ export const formSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+    <#if po.fieldDbType=='int'>
+        stringToNumber: true
+    </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
@ -612,13 +618,19 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    <#elseif po.classType=='list'>
    component: 'JDictSelectTag',
    componentProps:{
-        dictCode:"${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}",
+     <#if po.fieldDbType=='int'>
+        stringToNumber: true
+     </#if>
     },
    <#elseif po.classType=='radio'>
    component: 'JDictSelectTag',
    componentProps:{
        dictCode:"${form_field_dictCode}",
-        type: "radio"
+        type: "radio",
+      <#if po.fieldDbType=='int'>
+        stringToNumber: true
+      </#if>
     },
     <#-- update-begin---author:chenrui ---date:20231228  for：[QQYUN-7583] Vue3风格表单页面多选控件渲染成了下拉多选---------- -->
    <#elseif po.classType=='list_multi'>
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@ -57,7 +57,7 @@
 		<!-- 积木报表-->
 		<jimureport-spring-boot-starter.version>2.2.0</jimureport-spring-boot-starter.version>
 		<jimubi-spring-boot-starter.version>2.2.0</jimubi-spring-boot-starter.version>
-		<minidao.version>1.10.16</minidao.version>
+		<minidao.version>1.10.18</minidao.version>
 		<autopoi-web.version>2.0.2</autopoi-web.version>
 		
 		<!-- 持久层 -->
@ -480,17 +480,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-core</artifactId>
-				<version>5.6.7.Final</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-collections</groupId>
-						<artifactId>commons-collections</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<!-- AutoPoi Excel工具类-->
 			<dependency>
 				<groupId>org.jeecgframework</groupId>
--- a/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue
+++ b/jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/UserSelectModal.vue
@ -60,7 +60,7 @@
  import { useSelectBiz } from '/@/components/Form/src/jeecg/hooks/useSelectBiz';
  import { useAttrs } from '/@/hooks/core/useAttrs';
  import { selectProps } from '/@/components/Form/src/jeecg/props/props';
-
+  import { isArray, cloneDeep } from 'lodash-es';
  export default defineComponent({
    name: 'UserSelectModal',
    components: {
@ -115,8 +115,14 @@
        }
        // 代码逻辑说明: VUEN-1112 一对多 用户选择 未显示选择条数，及清空
        setTimeout(() => {
+          // update-begin--author:liaozhiyang---date:20260120--for：【issues/9275】用户组件第二次点击取消时勾选值还是回显了
+          let selectedData = selectValues['value'];
+          if (isArray(selectedData)) {
+            selectedData = cloneDeep(selectedData);
+          }
+          // update-end--author:liaozhiyang---date:20260120--for：【issues/9275】用户组件第二次点击取消时勾选值还是回显了
          if (tableRef.value) {
-            tableRef.value.setSelectedRowKeys(selectValues['value'] || []);
+            tableRef.value.setSelectedRowKeys(selectedData || []);
          }
        }, 800);
      });
--- a/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts
+++ b/jeecgboot-vue3/src/components/Table/src/hooks/useTableScroll.ts
@ -106,7 +106,8 @@ export function useTableScroll(
    const paddingHeight = 32;
    // Pager height
    let paginationHeight = 2;
-    if (!isBoolean(pagination)) {
+    // 【issues/9217】当配置了pagination: true时,BasicTable组件自适应高度异常
+    if (pagination !== false) {
      paginationEl = tableEl.querySelector('.ant-pagination') as HTMLElement;
      if (paginationEl) {
        const offsetHeight = paginationEl.offsetHeight;
--- a/jeecgboot-vue3/src/hooks/system/useListPage.ts
+++ b/jeecgboot-vue3/src/hooks/system/useListPage.ts
@ -75,6 +75,10 @@ export function useListPage(options: ListPageOptions) {
        if (options?.tableProps?.useSearchForm !== false) {
          paramsForm = await getForm().validate();
          console.log('paramsForm', paramsForm);
+          // 在这里把执行beforeFetch
+          if (options?.tableProps?.beforeFetch) {
+            paramsForm = await options?.tableProps?.beforeFetch(paramsForm);
+          }
        }
      } catch (e) {
        console.warn(e);
Author	SHA1	Message	Date
JEECG	41877a6e8b	【issues/9275】用户组件第二次点击取消时勾选值还是回显了	2026-01-20 12:02:54 +08:00
JEECG	b7a3da89ca	同步钉钉部门报错 #9228	2026-01-09 14:39:15 +08:00
JEECG	de4a8ce652	--author:scott--date:20260108--for:升级minidao版本至1.10.18	2026-01-08 16:20:28 +08:00
JEECG	e533af285c	【issues/9217】当配置了pagination: true时,BasicTable组件自适应高度异常	2025-12-31 16:43:12 +08:00
JEECG	23dc7b3f03	字段类型是int,生成的代码，字典未匹配上，默认加上转换	2025-12-26 10:54:38 +08:00
JEECG	e57aef0708	使用useListPage的导出异常 #9209	2025-12-26 10:50:11 +08:00