From 8037a5566b134990dc59a66ba44c7778b5e40241 Mon Sep 17 00:00:00 2001
From: zhuangdashia <cos35507550@163.com>
Date: Thu, 11 Sep 2025 14:31:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A1=E4=BB=B7=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=8F=AF=E5=AF=BC=E5=85=A5=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/performance-m/index.vue  | 22 +++++++++----------
 .../src/views/report/performance-q/index.vue  | 22 +++++++++----------
 .../src/views/report/performance-y/index.vue  | 22 +++++++++----------
 .../views/report/pricing-summary-m/index.vue  | 22 +++++++++----------
 .../views/report/pricing-summary-q/index.vue  | 22 +++++++++----------
 .../views/report/pricing-summary-y/index.vue  | 22 +++++++++----------
 .../src/views/report/valid-invalid/index.vue  | 22 +++++++++----------
 7 files changed, 70 insertions(+), 84 deletions(-)

diff --git a/cds-fontend-2025.V1/src/views/report/performance-m/index.vue b/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
index 65f9cfc..bdf5d10 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-m/index.vue
@@ -1261,8 +1261,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -1338,22 +1336,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:performanceM:add')"
-          :show-delete="hasAuth('report:performanceM:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:performanceM:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:performanceM:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:performanceM:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/performance-q/index.vue b/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
index 198a0d9..70b19f3 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-q/index.vue
@@ -1261,8 +1261,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -1338,22 +1336,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:performanceQ:add')"
-          :show-delete="hasAuth('report:performanceQ:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:performanceQ:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:performanceQ:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:performanceQ:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/performance-y/index.vue b/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
index d17b8d7..a7488da 100644
--- a/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/performance-y/index.vue
@@ -1261,8 +1261,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -1338,22 +1336,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:performanceY:add')"
-          :show-delete="hasAuth('report:performanceY:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:performanceY:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:performanceY:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:performanceY:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
index ff23f73..8174419 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-m/index.vue
@@ -216,8 +216,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -293,22 +291,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:pricingSummaryM:add')"
-          :show-delete="hasAuth('report:pricingSummaryM:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:pricingSummaryM:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:pricingSummaryM:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:pricingSummaryM:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
index 2d4b0fa..b585aff 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-q/index.vue
@@ -216,8 +216,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -293,22 +291,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:pricingSummaryQ:add')"
-          :show-delete="hasAuth('report:pricingSummaryQ:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:pricingSummaryQ:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:pricingSummaryQ:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:pricingSummaryQ:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue b/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
index dd8f7ec..6a83050 100644
--- a/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/pricing-summary-y/index.vue
@@ -216,8 +216,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -293,22 +291,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:pricingSummaryY:add')"
-          :show-delete="hasAuth('report:pricingSummaryY:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:pricingSummaryY:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:pricingSummaryY:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:pricingSummaryY:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 
diff --git a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
index 32e8d0e..39150be 100644
--- a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
+++ b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue
@@ -225,8 +225,6 @@ const {
         return (
           <div class="flex-center gap-8px">
             {editBtn()}
-            {divider()}
-            {deleteBtn()}
           </div>
         );
       }
@@ -302,22 +300,22 @@ function handleExport() {
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
-          :show-add="hasAuth('report:validInvalid:add')"
-          :show-delete="hasAuth('report:validInvalid:remove')"
+          :show-add="false"
+          :show-delete="false"
           :show-export="hasAuth('report:validInvalid:export')"
           @add="handleAdd"
           @delete="handleBatchDelete"
           @export="handleExport"
           @refresh="getData"
         >
-            <template #after>
-                <NButton v-if="hasAuth('report:validInvalid:import')" size="small" ghost @click="handleImport">
-                    <template #icon>
-                        <SvgIcon local-icon="upload-rounded"/>
-                    </template>
-                    {{ $t('common.import') }}
-                </NButton>
-            </template>
+<!--            <template #after>-->
+<!--                <NButton v-if="hasAuth('report:validInvalid:import')" size="small" ghost @click="handleImport">-->
+<!--                    <template #icon>-->
+<!--                        <SvgIcon local-icon="upload-rounded"/>-->
+<!--                    </template>-->
+<!--                    {{ $t('common.import') }}-->
+<!--                </NButton>-->
+<!--            </template>-->
         </TableHeaderOperation>
       </template>
 

From f345b0ffd271ade7f71d4b7b858de0439722d027 Mon Sep 17 00:00:00 2001
From: "SGK\\17962" <1796293269@qq.com>
Date: Thu, 11 Sep 2025 16:49:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/service/impl/SysUserServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 4e76f2c..24a8b51 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -518,10 +518,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     private void insertUserPost(SysUserBo user, boolean clear) {
         Long[] posts = user.getPostIds();
-        if (posts.length >1) {
-            throw new ServiceException("用户" + user.getUserName() + "不能添加多个岗位");
-        }
         if (ArrayUtil.isNotEmpty(posts)) {
+            if (posts.length >1) {
+                throw new ServiceException("用户" + user.getUserName() + "不能添加多个岗位");
+            }
             if (clear) {
                 // 删除用户与岗位关联
                 userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, user.getUserId()));