From 6ab4ee6a918ae43bcae0ddec71afe3a472c54b85 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sun, 5 Nov 2023 11:36:53 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=85=B3=E7=B3=BB=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysUserServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 54d883b9..6f01f685 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -929,7 +929,17 @@ public class SysUserServiceImpl extends ServiceImpl impl relation.setUserId(userId); relation.setTenantId(Integer.valueOf(tenantId)); relation.setStatus(CommonConstant.STATUS_1); - relationMapper.insert(relation); + + LambdaQueryWrapper sysUserTenantQueryWrapper = new LambdaQueryWrapper() + .eq(SysUserTenant::getUserId, userId) + .eq(SysUserTenant::getTenantId,Integer.valueOf(tenantId)); + SysUserTenant tenantPresent = relationMapper.selectOne(sysUserTenantQueryWrapper); + if (tenantPresent != null) { + tenantPresent.setStatus(CommonConstant.STATUS_1); + relationMapper.updateById(tenantPresent); + }else{ + relationMapper.insert(relation); + } } }else{ //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】 @@ -960,7 +970,7 @@ public class SysUserServiceImpl extends ServiceImpl impl LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysUserTenant::getUserId, userId); //数据库的租户id - List oldTenantIds = relationMapper.getTenantIdsNoStatus(userId); + List oldTenantIds = relationMapper.getTenantIdsByUserId(userId); //如果传过来的租户id为空,那么就删除租户 if (oConvertUtils.isEmpty(relTenantIds) && CollectionUtils.isNotEmpty(oldTenantIds)) { this.deleteTenantByUserId(userId, null); From 8216889078777d48b80543808d5ce50d45f968e5 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 15 Nov 2023 10:38:18 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/form/native/vue3NativeSearch.ftl | 56 ++++++++++++++----- .../vue3Native/${entityName}List.vuei | 7 +-- .../components/${entityName}Form.vuei | 4 +- .../vue3Native/${entityName}List.vuei | 9 ++- .../components/${entityName}Form.vuei | 5 +- .../vue3Native/${entityName}List.vuei | 11 ++-- .../vue3Native/[1-n]List.vuei | 7 ++- .../components/${entityName}Form.vuei | 4 +- .../vue3Native/components/[1-n]Form.vuei | 6 +- .../vue3Native/${entityName}List.vuei | 7 +-- 10 files changed, 75 insertions(+), 41 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl index 8b30eb15..911ba7fd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl @@ -14,12 +14,12 @@ <#if po.queryMode=='single'> <#if query_field_no gt 1> - <#if query_field_no gt 1> + <#if query_field_no gt 1> <#if query_field_no gt 1> <#if po.classType=='sel_search'> <#if query_field_no gt 1> <#elseif po.classType=='sel_user'> - <#if query_field_no gt 1> + <#if query_field_no gt 1> <#elseif po.classType=='switch'> <#if query_field_no gt 1> :options="${po.dictField}" query /> <#elseif po.classType=='sel_depart'> @@ -32,8 +32,10 @@ <#if query_field_no gt 1> <#elseif po.classType=='datetime'> <#if query_field_no gt 1> + <#elseif po.classType=='time'> + <#if query_field_no gt 1> <#elseif po.classType=='pca'> - <#if query_field_no gt 1> + <#if query_field_no gt 1> <#elseif po.classType=='sel_tree'> <#if query_field_no gt 1> <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}" <#elseif po.dictText?split(',')[1]??>pidField:"${po.dictText?split(',')[1]}", <#elseif po.dictText?split(',')[3]??>hasChildField:"${po.dictText?split(',')[3]}" pidValue="${po.dictField}" /> <#elseif po.classType=='popup'> @@ -60,7 +62,7 @@ <#if query_field_no gt 1> <#else> - <#if query_field_no gt 1> + <#if query_field_no gt 1> <#if query_field_no gt 1> <#if query_field_no gt 1> @@ -69,17 +71,45 @@ <#if query_field_no gt 1> <#if query_field_no gt 1> <#if po.classType=='date'> - <#if query_field_no gt 1> - <#if query_field_no gt 1> ~ - <#if query_field_no gt 1> + <#if query_field_no gt 1>
+ <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> ~ + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1>
+ <#elseif po.classType=='time'> + <#if query_field_no gt 1>
+ <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> ~ + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1>
<#elseif po.classType=='datetime'> - <#if query_field_no gt 1> - <#if query_field_no gt 1> ~ - <#if query_field_no gt 1> + <#if query_field_no gt 1>
+ <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> ~ + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1>
<#else> - <#if query_field_no gt 1> - <#if query_field_no gt 1> ~ - <#if query_field_no gt 1> + <#if query_field_no gt 1>
+ <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> ~ + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1> + <#if query_field_no gt 1>
<#if query_field_no gt 1>
<#if query_field_no gt 1> diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index ddcbb05c..3b50d581 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -329,13 +329,13 @@ } - <#if need_pca> + <#if need_pca || need_dept_user> /** - * 省市区点击事件 + * form点击事件(以逗号分割) * @param key * @param value */ - function handleAreaChange(key, value) { + function handleFormJoinChange(key, value) { queryParam[key] = value.join(','); } @@ -397,7 +397,6 @@ white-space: nowrap; } .query-group-cust{ - width: calc(50% - 15px); min-width: 100px !important; } .query-group-split-cust{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index c85652df..7dc1eba9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -212,8 +212,8 @@ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index ae5efc29..d83211eb 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -501,14 +501,14 @@ } - <#if need_pca> + <#if need_pca || need_dept_user> /** - * 省市区点击事件 + * form点击事件(以逗号分割) * @param key * @param value */ - function handleAreaChange(key, value) { - queryParam.value[key] = value.join(','); + function handleFormJoinChange(key, value) { + queryParam[key] = value.join(','); } @@ -554,7 +554,6 @@ white-space: nowrap; } .query-group-cust{ - width: calc(50% - 15px); min-width: 100px !important; } .query-group-split-cust{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index 2cdf4234..e916af2f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -208,6 +208,7 @@ .then(async (res) => { if (res.success) { await getExpandKeysByPid(formData['${pidFieldName}'], unref(treeData)); + delete formData['children']; emit('ok', { isUpdate: unref(isUpdate), values: { ...formData }, @@ -263,8 +264,8 @@ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index 36e90767..3b24b948 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -125,6 +125,10 @@ 无文件 下载 + <#if po.classType=='pca'> + + {{ getAreaTextByCode(text) }} + @@ -393,13 +397,13 @@ } - <#if need_pca> + <#if need_pca || need_dept_user> /** - * 省市区点击事件 + * form点击事件(以逗号分割) * @param key * @param value */ - function handleAreaChange(key, value) { + function handleFormJoinChange(key, value) { queryParam[key] = value.join(','); } @@ -413,7 +417,6 @@ white-space: nowrap; } .query-group-cust{ - width: calc(50% - 15px); min-width: 100px !important; } .query-group-split-cust{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei index f861a448..60fa006c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei @@ -42,6 +42,10 @@ 无文件 下载 + <#if po.classType=='pca'> + + {{ getAreaTextByCode(text) }} + @@ -138,7 +142,7 @@ */ async function handleEdit(record: Recordable) { registerModal.value.disableSubmit = false; - registerModal.value.edit(); + registerModal.value.edit(record); } /** @@ -227,7 +231,6 @@ white-space: nowrap; } .query-group-cust{ - width: calc(50% - 15px); min-width: 100px !important; } .query-group-split-cust{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei index e3b2330b..e652654e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei @@ -211,8 +211,8 @@ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei index 1ded92d5..4681d737 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei @@ -29,7 +29,7 @@ <#assign hasOnlyValidate = false>