From e5460ae3cccf5658cbaa024559029f237f5ae587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 26 Mar 2023 16:22:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E3=80=81=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.BBS.Vue3/src/App.vue                       |  13 +-
 Yi.BBS.Vue3/src/apis/configApi.js             |   9 ++
 Yi.BBS.Vue3/src/components/AgreeInfo.vue      |  55 ++++++++
 Yi.BBS.Vue3/src/components/BottomInfo.vue     |  10 +-
 Yi.BBS.Vue3/src/components/DisscussCard.vue   |   7 +-
 Yi.BBS.Vue3/src/components/UserSelectInfo.vue | 129 ++++++++++++++++++
 Yi.BBS.Vue3/src/layout/AppHeader.vue          |   4 +-
 Yi.BBS.Vue3/src/stores/config.js              |  22 +++
 Yi.BBS.Vue3/src/utils/request.js              |   4 +
 Yi.BBS.Vue3/src/views/Article.vue             |   4 +-
 Yi.BBS.Vue3/src/views/Discuss.vue             |   5 +
 Yi.BBS.Vue3/src/views/EditArticle.vue         |   9 ++
 Yi.BBS.Vue3/src/views/Login.vue               |   4 +-
 Yi.BBS.Vue3/src/views/profile/UserInfo.vue    |   4 +-
 .../DictionaryService.cs                      |   3 +-
 .../DictionaryTypeService.cs                  |   2 +-
 .../DataSeeds/BbsConfigDataSeed.cs            |  37 +++++
 .../BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml    |   5 +
 .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 352256 -> 352256 bytes
 .../Dtos/Discuss/DiscussGetListOutputDto.cs   |  24 ++--
 .../Forum/Dtos/Discuss/DiscussGetOutputDto.cs |   2 +
 .../Dtos/Discuss/DiscussUpdateInputVo.cs      |   1 +
 .../Forum/DiscussService.cs                   |   7 +
 .../Forum/ConstClasses/DiscussConst.cs        |   2 +-
 .../bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml    |   5 +
 .../Forum/Entities/DiscussEntity.cs           |   7 +
 .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 352256 -> 352256 bytes
 .../Identity/Dtos/User/UserGetListInputVo.cs  |   2 +
 .../Identity/UserService.cs                   |   5 +
 .../src/components/Pagination/index.vue       |   2 +-
 Yi.RuoYi.Vue3/src/utils/request.js            |   3 +
 .../src/views/ERP/material/index.vue          |   2 +-
 .../src/views/ERP/purchase/index.vue          |   4 +-
 Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue   |   2 +-
 .../src/views/ERP/supplier/index.vue          |   2 +-
 Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue    |   2 +-
 .../src/views/ERP/warehouse/index.vue         |   2 +-
 Yi.RuoYi.Vue3/src/views/bbs/article/index.vue |   2 +-
 Yi.RuoYi.Vue3/src/views/monitor/job/index.vue |   2 +-
 Yi.RuoYi.Vue3/src/views/monitor/job/log.vue   |   2 +-
 .../src/views/monitor/logininfor/index.vue    |   2 +-
 .../src/views/monitor/online/index.vue        |   2 +-
 .../src/views/monitor/operlog/index.vue       |   2 +-
 .../src/views/system/config/index.vue         |   2 +-
 Yi.RuoYi.Vue3/src/views/system/dict/data.vue  |   2 +-
 Yi.RuoYi.Vue3/src/views/system/dict/index.vue |   3 +-
 .../src/views/system/notice/index.vue         |   2 +-
 Yi.RuoYi.Vue3/src/views/system/post/index.vue |   2 +-
 .../src/views/system/role/authUser.vue        |   2 +-
 Yi.RuoYi.Vue3/src/views/system/role/index.vue |   2 +-
 .../src/views/system/role/selectUser.vue      |   2 +-
 .../src/views/system/user/authRole.vue        |   2 +-
 Yi.RuoYi.Vue3/src/views/system/user/index.vue |   2 +-
 .../src/views/tool/gen/importTable.vue        |   2 +-
 Yi.RuoYi.Vue3/src/views/tool/gen/index.vue    |   2 +-
 55 files changed, 386 insertions(+), 51 deletions(-)
 create mode 100644 Yi.BBS.Vue3/src/apis/configApi.js
 create mode 100644 Yi.BBS.Vue3/src/components/AgreeInfo.vue
 create mode 100644 Yi.BBS.Vue3/src/components/UserSelectInfo.vue
 create mode 100644 Yi.BBS.Vue3/src/stores/config.js
 create mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs

diff --git a/Yi.BBS.Vue3/src/App.vue b/Yi.BBS.Vue3/src/App.vue
index cf631c70..a4a6f782 100644
--- a/Yi.BBS.Vue3/src/App.vue
+++ b/Yi.BBS.Vue3/src/App.vue
@@ -7,10 +7,21 @@
 </el-config-provider>
 </template>
 <script setup>
-  import { ElConfigProvider } from 'element-plus'
+import useConfigStore from "@/stores/config";
+import { ElConfigProvider } from 'element-plus'
+import {onMounted  } from "vue";
 
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 const locale= zhCn;
+
+const configStore = useConfigStore();
+
+//加载全局信息
+onMounted(async()=>{
+
+await configStore.getConfig();
+})
+
 </script>
 <style scoped>
 
diff --git a/Yi.BBS.Vue3/src/apis/configApi.js b/Yi.BBS.Vue3/src/apis/configApi.js
new file mode 100644
index 00000000..79e7edf9
--- /dev/null
+++ b/Yi.BBS.Vue3/src/apis/configApi.js
@@ -0,0 +1,9 @@
+import myaxios from '@/utils/request'
+
+//获取配置
+export function getAll(){
+    return myaxios({
+        url: '/config',
+        method: 'get'
+    })
+};
\ No newline at end of file
diff --git a/Yi.BBS.Vue3/src/components/AgreeInfo.vue b/Yi.BBS.Vue3/src/components/AgreeInfo.vue
new file mode 100644
index 00000000..20913f40
--- /dev/null
+++ b/Yi.BBS.Vue3/src/components/AgreeInfo.vue
@@ -0,0 +1,55 @@
+<template>
+       <el-button text @click="agree">
+                            <el-icon v-if="data.isAgree" color="#409EFF">
+                                <CircleCheckFilled />
+                            </el-icon>
+                            <el-icon v-else color="#1E1E1E">
+                                <Pointer />
+                            </el-icon> 点赞:{{ data.agreeNum ?? 0 }}</el-button>
+    </template>
+    <script setup>
+import {onMounted,reactive,watch} from 'vue'
+import { operate } from '@/apis/agreeApi'
+
+
+//'isAgree','agreeNum','id'
+const props = defineProps([ 'data'])
+
+watch(()=>props,(n)=>{
+    data.id=n.data.id;
+    data.isAgree=n.data.isAgree;
+    data.agreeNum=n.data.agreeNum;
+},{deep:true})
+
+
+const data=reactive({
+    id:'',
+    isAgree:false,
+    agreeNum:0
+})
+// onMounted(()=>{
+  
+// })
+//点赞操作
+const agree = async () => {
+    const response = await operate(data.id)
+    const res = response.data;
+    //提示框，颜色区分
+    if (res.isAgree) {
+        data.isAgree = true;
+        data.agreeNum += 1;
+        ElMessage({
+            message: res.message,
+            type: 'success',
+        })
+    }
+    else {
+        data.isAgree = false;
+        data.agreeNum-= 1;
+        ElMessage({
+            message: res.message,
+            type: 'warning',
+        })
+    }
+}
+</script>
\ No newline at end of file
diff --git a/Yi.BBS.Vue3/src/components/BottomInfo.vue b/Yi.BBS.Vue3/src/components/BottomInfo.vue
index b1ebbe07..79edfa8b 100644
--- a/Yi.BBS.Vue3/src/components/BottomInfo.vue
+++ b/Yi.BBS.Vue3/src/components/BottomInfo.vue
@@ -1,14 +1,16 @@
 <template>
 <div class="botton-div">
-<a><el-icon><UserFilled /></el-icon>站长：橙子</a>
-<a><el-icon><Search /></el-icon>YiFramework意框架</a>
+<a><el-icon><UserFilled /></el-icon>站长：{{configStore.author}}</a>
+<a><el-icon><Search /></el-icon>{{configStore.bottom}}</a>
 <a><el-icon><View /></el-icon>关于本站</a>
 <a><el-icon><Message /></el-icon>建议反馈</a>
 <p></p>
-<a><el-icon><Position /></el-icon>2023 <span style="color: #40a9ff ;">意社区</span> | 赣ICP备xxxxxx号-4</a>
+<a ><el-icon><Position /></el-icon>{{configStore.icp}}</a>
 </div>
 </template>
 <script setup>
+import useConfigStore from "@/stores/config";
+const  configStore= useConfigStore();
 </script>
 <style scoped>
 .el-icon
@@ -31,6 +33,6 @@ a:hover {
     height: auto;
     width: auto;
     justify-content: center;
-    margin: 1rem auto;
+    margin: 0.5rem auto;
 }
 </style>
\ No newline at end of file
diff --git a/Yi.BBS.Vue3/src/components/DisscussCard.vue b/Yi.BBS.Vue3/src/components/DisscussCard.vue
index 9466d325..f2e96544 100644
--- a/Yi.BBS.Vue3/src/components/DisscussCard.vue
+++ b/Yi.BBS.Vue3/src/components/DisscussCard.vue
@@ -41,8 +41,8 @@
                         <div class="item-description">
                             {{ discuss.creationTime }}
                         </div>
-
-
+<AgreeInfo  :data="discuss"/>
+<!-- 
                         <el-button text @click="agree">
                             <el-icon v-if="discuss.isAgree" color="#409EFF">
                                 <CircleCheckFilled />
@@ -51,7 +51,7 @@
                                 <Pointer />
                             </el-icon> 点赞:{{ discuss.agreeNum ?? 0 }}</el-button>
                         <el-button icon="Star" text>
-                            收藏</el-button>
+                            收藏</el-button> -->
 
                         <el-button icon="View" text>
                             浏览数:{{ discuss.seeNum ?? 0 }}</el-button>
@@ -69,6 +69,7 @@
 import { h, ref, toRef, onMounted ,reactive} from 'vue'
 import { useRouter } from 'vue-router'
 import AvatarInfo from './AvatarInfo.vue';
+import AgreeInfo from './AgreeInfo.vue'
 import { operate } from '@/apis/agreeApi'
 
 const props = defineProps(['discuss','badge'])
diff --git a/Yi.BBS.Vue3/src/components/UserSelectInfo.vue b/Yi.BBS.Vue3/src/components/UserSelectInfo.vue
new file mode 100644
index 00000000..cfc6df6d
--- /dev/null
+++ b/Yi.BBS.Vue3/src/components/UserSelectInfo.vue
@@ -0,0 +1,129 @@
+<template>
+      <el-select
+      style="width: 600px;"
+        v-model="value"
+        multiple
+        filterable
+        remote
+        reserve-keyword
+        placeholder="请输入用户账号（可多选）"
+        remote-show-suffix
+        :remote-method="remoteMethod"
+        :loading="loading"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+</template>
+
+<script  setup>
+import { onMounted, ref,computed  } from 'vue'
+import {listUser} from '@/apis/userApi'
+const props = defineProps(['modelValue'])
+const emit = defineEmits(['update:modelValue'])
+
+
+//这个为可选择的列表，{value,label},value为用户id，label为账号名称（不可重复）
+const options = ref([])
+
+const value = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  }
+})
+
+
+const loading = ref(false)
+
+onMounted( async()=>{
+
+ const response= await  listUser({ids:value.value.join()});
+ const res=response.data.items;
+   //下拉列表
+   options.value = res
+  .map((item) => {
+    return { value: `${item.id}`, label: `用户:${item.userName}` }
+  })
+})
+
+
+const loadUser=async(query)=>{
+  const response= await listUser({userName:query});
+  const res=response.data.items;
+  //下拉列表
+  options.value = res
+  .map((item) => {
+    return { value: `${item.id}`, label: `用户:${item.userName}` }
+  })
+}
+
+const remoteMethod =async (query) => {
+  if (query) {
+    loading.value = true
+   await loadUser(query);
+   loading.value = false
+  } else {
+    options.value = []
+  }
+}
+
+const states = [
+  'Alabama',
+  'Alaska',
+  'Arizona',
+  'Arkansas',
+  'California',
+  'Colorado',
+  'Connecticut',
+  'Delaware',
+  'Florida',
+  'Georgia',
+  'Hawaii',
+  'Idaho',
+  'Illinois',
+  'Indiana',
+  'Iowa',
+  'Kansas',
+  'Kentucky',
+  'Louisiana',
+  'Maine',
+  'Maryland',
+  'Massachusetts',
+  'Michigan',
+  'Minnesota',
+  'Mississippi',
+  'Missouri',
+  'Montana',
+  'Nebraska',
+  'Nevada',
+  'New Hampshire',
+  'New Jersey',
+  'New Mexico',
+  'New York',
+  'North Carolina',
+  'North Dakota',
+  'Ohio',
+  'Oklahoma',
+  'Oregon',
+  'Pennsylvania',
+  'Rhode Island',
+  'South Carolina',
+  'South Dakota',
+  'Tennessee',
+  'Texas',
+  'Utah',
+  'Vermont',
+  'Virginia',
+  'Washington',
+  'West Virginia',
+  'Wisconsin',
+  'Wyoming',
+]
+</script>
\ No newline at end of file
diff --git a/Yi.BBS.Vue3/src/layout/AppHeader.vue b/Yi.BBS.Vue3/src/layout/AppHeader.vue
index 513b80e9..3d3bc0f5 100644
--- a/Yi.BBS.Vue3/src/layout/AppHeader.vue
+++ b/Yi.BBS.Vue3/src/layout/AppHeader.vue
@@ -8,7 +8,7 @@
     
   >
  <el-menu-item class="logo"  index="" @click="enterIndex" >   
-    <img class="img-icon" style="width: 35px; height: 35px" src="@/assets/logo.ico"  />Yi意社区</el-menu-item>
+    <img class="img-icon" style="width: 35px; height: 35px" src="@/assets/logo.ico"  />{{configStore.name}}</el-menu-item>
  <el-menu-item index="1" @click="enterIndex">主页</el-menu-item>
     <el-sub-menu index="2">
       <template #title>学习</template>
@@ -56,6 +56,8 @@ import AvatarInfo from '@/components/AvatarInfo.vue'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import useUserStore from '@/stores/user.js'
+import useConfigStore from "@/stores/config";
+const  configStore= useConfigStore();
 const router = useRouter()
 const userStore =useUserStore();
 const activeIndex = ref('1')
diff --git a/Yi.BBS.Vue3/src/stores/config.js b/Yi.BBS.Vue3/src/stores/config.js
new file mode 100644
index 00000000..5d1c0c7d
--- /dev/null
+++ b/Yi.BBS.Vue3/src/stores/config.js
@@ -0,0 +1,22 @@
+import {getAll} from '@/apis/configApi'
+import { defineStore } from 'pinia'
+const useConfigStore = defineStore('config',
+    {
+        state: () => ({
+            data: []
+        }),
+        getters: {
+            name:(state)=>state.data.filter(s=> s.configKey=='bbs.site.name').map(x=>x.configValue)[0],
+            author:(state)=>state.data.filter(s=> s.configKey=='bbs.site.author').map(x=>x.configValue)[0],
+            icp:(state)=>state.data.filter(s=> s.configKey=='bbs.site.icp').map(x=>x.configValue)[0],
+            bottom:(state)=>state.data.filter(s=>s.configKey=='bbs.site.bottom').map(x=>x.configValue)[0]
+        },
+        actions: {
+            // 登录
+            async getConfig() {
+                const response = await getAll();
+                this.data = response.data.items;
+            },
+        },
+    })
+export default useConfigStore;
diff --git a/Yi.BBS.Vue3/src/utils/request.js b/Yi.BBS.Vue3/src/utils/request.js
index 9e2c64e5..ed4b6120 100644
--- a/Yi.BBS.Vue3/src/utils/request.js
+++ b/Yi.BBS.Vue3/src/utils/request.js
@@ -20,11 +20,15 @@ const myaxios = axios.create({
     //       }
     // }],
 })
+
+
+
 // 请求拦截器
 myaxios.interceptors.request.use(function (config) {
     if (getToken()) {
         config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       }
+
     return config;
 }, function (error) {
     return Promise.reject(error);
diff --git a/Yi.BBS.Vue3/src/views/Article.vue b/Yi.BBS.Vue3/src/views/Article.vue
index 533ac54c..aa607e5a 100644
--- a/Yi.BBS.Vue3/src/views/Article.vue
+++ b/Yi.BBS.Vue3/src/views/Article.vue
@@ -49,7 +49,7 @@
             <el-divider class="tab-divider" />
 
             <el-space :size="10" :spacer="spacer">
-              <el-button icon="Pointer" text> 4</el-button>
+              <AgreeInfo  :data="discuss"/>
               <el-button icon="Star" text> 0</el-button>
               <el-button icon="Share" text> 分享</el-button>
               <el-button icon="Operation" text> 操作</el-button>
@@ -134,7 +134,7 @@ import CommentInfo from "@/components/CommentInfo.vue";
 import BottomInfo from '@/components/BottomInfo.vue'
 import TreeArticleInfo from "@/components/TreeArticleInfo.vue";
 import { useRoute, useRouter } from "vue-router";
-
+import AgreeInfo from '@/components/AgreeInfo.vue'
 import { get as discussGet, del as discussDel } from "@/apis/discussApi.js";
 import { all as articleall, del as articleDel, get as articleGet } from "@/apis/articleApi.js";
 //数据定义
diff --git a/Yi.BBS.Vue3/src/views/Discuss.vue b/Yi.BBS.Vue3/src/views/Discuss.vue
index 0a4f267c..03bc6733 100644
--- a/Yi.BBS.Vue3/src/views/Discuss.vue
+++ b/Yi.BBS.Vue3/src/views/Discuss.vue
@@ -213,4 +213,9 @@ display: flex;
 .collapse-list >>> .el-collapse-item__header {
 border-bottom-color: #F0F2F5 !important;
 }
+
+.el-divider
+{
+  margin: 0.5rem 0;
+}
 </style>
\ No newline at end of file
diff --git a/Yi.BBS.Vue3/src/views/EditArticle.vue b/Yi.BBS.Vue3/src/views/EditArticle.vue
index 84992439..5a47f2ac 100644
--- a/Yi.BBS.Vue3/src/views/EditArticle.vue
+++ b/Yi.BBS.Vue3/src/views/EditArticle.vue
@@ -18,6 +18,10 @@
             <el-radio-button label="User">部分用户可见</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="可见用户：" v-if="route.query.artType == 'discuss' && perRadio=='User'">
+          <UserSelectInfo v-model="editForm.permissionUserIds"/>
+        </el-form-item>
+
 
 
         <el-form-item v-if="route.query.artType == 'article'" label="子文章名称：" prop="name">
@@ -59,6 +63,7 @@
 </template>
 <script setup>
 import MavonEdit from "@/components/MavonEdit.vue";
+import UserSelectInfo from '@/components/UserSelectInfo.vue'
 import { ref, reactive, onMounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
@@ -103,6 +108,7 @@ const editForm = reactive({
   introduction: "",
   content: "",
   name: "",
+  permissionUserIds:[]
 });
 
 //组装主题内容： 需要更新主题信息
@@ -145,6 +151,8 @@ const submit = async (formEl) => {
         discuss.plateId = discuss.plateId ?? route.query.plateId
         discuss.cover=dialogImageUrl.value;
         discuss.permissionType=perRadio.value;
+
+        discuss.permissionUserIds=editForm.permissionUserIds;
         //主题创建
         if (route.query.operType == "create") {
           const response = await discussAdd(discuss);
@@ -231,6 +239,7 @@ const loadDiscuss = async () => {
   discuss.plateId = res.plateId;
   dialogImageUrl.value= res.cover;
   perRadio.value=res.permissionType;
+  editForm.permissionUserIds=res.permissionUserIds;
 };
 //加载文章
 const loadArticle = async () => {
diff --git a/Yi.BBS.Vue3/src/views/Login.vue b/Yi.BBS.Vue3/src/views/Login.vue
index 87b611bf..579aa6fb 100644
--- a/Yi.BBS.Vue3/src/views/Login.vue
+++ b/Yi.BBS.Vue3/src/views/Login.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="login-wrapper">
-        <h1>意社区-登录</h1>
+        <h1>{{configStore.name}}-登录</h1>
         <div class="login-form">
             <div class="username form-item">
                 <span>使用邮箱或者手机号</span>
@@ -38,6 +38,8 @@
 import { reactive } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import useUserStore from '@/stores/user.js'
+import useConfigStore from "@/stores/config";
+const  configStore= useConfigStore();
 const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
diff --git a/Yi.BBS.Vue3/src/views/profile/UserInfo.vue b/Yi.BBS.Vue3/src/views/profile/UserInfo.vue
index ed5cece4..32b382b1 100644
--- a/Yi.BBS.Vue3/src/views/profile/UserInfo.vue
+++ b/Yi.BBS.Vue3/src/views/profile/UserInfo.vue
@@ -14,8 +14,8 @@
     </el-form-item>
     <el-form-item label="性别">
       <el-radio-group v-model="user.sex">
-        <el-radio :label="0">男</el-radio>
-        <el-radio :label="1">女</el-radio>
+        <el-radio :label="'Male'">男</el-radio>
+        <el-radio :label="'Woman'">女</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryService.cs
index 40c3061b..eda37d68 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryService.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryService.cs
@@ -5,6 +5,7 @@ using Yi.Framework.Ddd.Dtos;
 using Yi.Framework.DictionaryManager.Entities;
 using Yi.Framework.DictionaryManager.Dtos.Dictionary;
 using Yi.Framework.Core.Attributes;
+using SqlSugar;
 
 namespace Yi.Framework.DictionaryManager
 {
@@ -21,7 +22,7 @@ namespace Yi.Framework.DictionaryManager
 
         public override async Task<PagedResultDto<DictionaryGetListOutputDto>> GetListAsync(DictionaryGetListInputVo input)
         {
-            int total = 0;
+            RefAsync<int> total = 0;
             var entities = await _DbQueryable.WhereIF(input.DictType is not null, x => x.DictType == input.DictType)
                       .WhereIF(input.DictLabel is not null, x => x.DictLabel!.Contains(input.DictLabel!))
                       .WhereIF(input.State is not null, x => x.State == input.State)
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryTypeService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryTypeService.cs
index 4bb7bb01..b2871f9a 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryTypeService.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.DictionaryManager/DictionaryTypeService.cs
@@ -20,7 +20,7 @@ namespace Yi.Framework.DictionaryManager
         public async override Task<PagedResultDto<DictionaryTypeGetListOutputDto>> GetListAsync(DictionaryTypeGetListInputVo input)
         {
 
-            int total = 0;
+          RefAsync<int> total = 0;
             var entities = await _DbQueryable.WhereIF(input.DictName is not null, x => x.DictName.Contains(input.DictName!))
                       .WhereIF(input.DictType is not null, x => x.DictType!.Contains(input.DictType!))
                       .WhereIF(input.State is not null, x => x.State == input.State)
diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs
new file mode 100644
index 00000000..6c517074
--- /dev/null
+++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsConfigDataSeed.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Data.DataSeeds;
+using Yi.Framework.Ddd.Repositories;
+using Yi.RBAC.Domain.Identity.Entities;
+using Yi.RBAC.Domain.Setting.Entities;
+using Yi.RBAC.Domain.Shared.Identity.EnumClasses;
+
+namespace Yi.BBS.Domain.DataSeed
+{
+    [AppService(typeof(IDataSeed))]
+    public class BbsConfigDataSeed : AbstractDataSeed<ConfigEntity>
+    {
+        public BbsConfigDataSeed(IRepository<ConfigEntity> repository) : base(repository)
+        {
+        }
+
+        public override async Task<bool> IsInvoker()
+        {
+            return !await _repository.IsAnyAsync(x => x.ConfigKey == "ConfigEntity");
+        }
+        public override List<ConfigEntity> GetSeedData()
+        {
+            List<ConfigEntity> entities = new List<ConfigEntity>()
+            {
+                  new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.name", ConfigValue = "Yi意社区", ConfigName = "bbs站点名称" },
+                   new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.author", ConfigValue = "橙子", ConfigName = "bbs站点作者" },
+                    new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.icp", ConfigValue = "2023 意社区 | 赣ICP备xxxxxx号-4", ConfigName = "bbs备案号" },
+                     new ConfigEntity { Id = SnowflakeHelper.NextId, ConfigKey = "bbs.site.bottom", ConfigValue = "YiFramework意框架", ConfigName = "bbs底部信息" },
+            };
+            return entities;
+        }
+    }
+}
diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml
index 7331f9e1..1882b0e9 100644
--- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml
+++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml
@@ -51,6 +51,11 @@
             封面
             </summary>
         </member>
+        <member name="P:Yi.BBS.Domain.Forum.Entities.DiscussEntity.PermissionUserIds">
+            <summary>
+            当PermissionType为部分用户时候，以下列表中的用户+创建者 代表拥有权限
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Domain.Forum.ForumManager">
             <summary>
             论坛模块的领域服务
diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db
index c7d77eefd37e4695e06c65836c19d600c948366e..329d4b552dd78b273b9ccbbe9d1ec7957f024e4a 100644
GIT binary patch
delta 2766
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

delta 1214
zcmZ{jZD<@t7{_OJclLJgc6TnRcj+b6#GIGZwzrv?eP1y|lcHbDiP|W%y|y4FzElfR
zXam|L+6Kkq#nx`BLNQt`qE?Brf`pzSh=|1$G$BQ(U$hn~RBAq`RGquDG#?c9*=2d&
ze$RiN8LnoAtC>o3qcjTu7~r;v8|2nIzJUqS?8x>{x5KxedP};mt+@eS2Dl3Y{T>~r
zE~Tc`@70sa56Z{za(r_Io`Q$l()r}`Poxq}EiLecu6SV_J|e{BBXHM6OlU~$kh-Sp
z+RU-ybI%CtMpq}bA%IWflJT1n8QuCX`XQZY3);|BL%OWRLz?)a7)w<+isOT=;<H37
z>Yp7>R5x??fFAAt7NU51t9W;#IIIrGiQOWE+_P7S()&adAJ`|3bm*RdE4V0l`qw(v
z-fh?op^)0cquOEalRhykQ@wDf0)O5J6xjlDuc`n`iAs}V56r}sN%40T4#XEe5c^<m
zv@B(1Pk*im6u2TBDDm<4#oJ)(OEYP}2(yaBDl)f?kdRuT?U?~#Zb004{V8#=l9r4U
z5I<;~z&YbQ{?d4yqda8j_z(ztWjT9#Au%x%?I=mBnk?V6UEjBCJNx0$H81nx*@^dd
z9*8FUrM+uaB-g^L=kcnQU7a@Sg_JAJOlsSn?L~K$q<;8xG+vUrH+H{%bY*ZIk@%q%
zm>#tq%7Se5>^HBCE;p)8lf)N*gr@*Lho|rvT*X)LJDm3wTyyBxU_aU>wXeShqH3ZH
zv!~~;{>ZB&_!8x^pa0Q+k(a7FzNitzSGP$CqDjgiFmf78-m47qnhz`S;DmH+tP82&
zCczX9Pyb5aqc>}_+GD9Flk>?w<%-giIG9KZCaMT?;$Pwxe82H3PyHK8Bdr@U5o<?d
zo34vbL*|Esn#?DZde(?)X5^Np96!1|KWVOAuc82;W~+1i3ql%Di&4s~`m_8+%RlvZ
zgga1E^j!z)OxM;p2pKhPJK%dvqb+%KTpCrnve7?zv^hF+D{`P1Nd@#kMAjm?%pB8Y
zHldzNT`O>G68Oya9nTItmvDvTN5NQ~OubHaM~zJRf3n1XlI3e;PUyHM3q}Tt8JXr<
z__RB2Oj}Z;=>qEHbUzi)V2w`FXh>YsaV_6sR<yMP-IC=<Z_0&yE!Vq|8=Y<EnL@Oy
z9rZ<*I*{JTSIrHH6B6I7W&4&BCp*!f%Iail3E(%dZOj=v4M9JmuhV9<a%zd6)M6@L
zx*cIj;!QxD=t1)s^J`++p+ilV5Sy^**Ai-qr5?11>-w!>{2KU<<NJPHKbJ8cM!AU0
G3E01~9VXNO

diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListOutputDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListOutputDto.cs
index a06b75d0..7042feb7 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListOutputDto.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListOutputDto.cs
@@ -48,9 +48,18 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         public string? PrivateCode { get; set; }
         public DateTime CreationTime { get; set; }
 
-
+        public List<long> PermissionUserIds { get; set; }
 
         public UserGetListOutputDto User { get; set; }
+
+        public void SetBan()
+        {
+            this.Title = DiscussConst.˽��;
+            this.Introduction = "";
+            this.Cover = null;
+            //����ֹ
+            this.IsBan = true;
+        }
     }
 
 
@@ -69,20 +78,19 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
                         //��ǰ�����ǽ��Լ��ɼ���ͬʱ���ǵ�ǰ��¼�û�
                         if (dto.User.Id != userId)
                         {
-                            dto.Title = DiscussConst.˽��;
-                            dto.Introduction= "";
-                            dto.Cover = null;
-                            //����ֹ
-                            dto.IsBan = true;
+                            dto.SetBan();
                         }
                         break;
                     case DiscussPermissionTypeEnum.User:
+                        //��ǰ����Ϊ���ֿɼ���ͬʱ���ǵ�ǰ��¼�û� Ҳ ���ڿɼ��û��б���
+                        if (dto.User.Id != userId && !dto.PermissionUserIds.Contains(userId))
+                        {
+                            dto.SetBan();
+                        }
                         break;
                     default:
                         break;
                 }
-
-
             });
         }
 
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetOutputDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetOutputDto.cs
index 3d81eb9d..19e1067b 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetOutputDto.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetOutputDto.cs
@@ -37,6 +37,8 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
         public string? PrivateCode { get; set; }
         public DateTime CreationTime { get; set; }
         public DiscussPermissionTypeEnum PermissionType { get; set; }
+
+        public List<long> PermissionUserIds { get; set; }
         public UserGetListOutputDto User { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussUpdateInputVo.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussUpdateInputVo.cs
index 135624c1..e65d890a 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussUpdateInputVo.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussUpdateInputVo.cs
@@ -17,6 +17,7 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         public string Content { get; set; }
         public string? Color { get; set; }
 
+        public List<long> PermissionUserIds { get; set; }
 
         public DiscussPermissionTypeEnum PermissionType { get; set; }
 
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs
index 4e1d1a84..000c595c 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs
@@ -141,6 +141,13 @@ namespace Yi.BBS.Application.Forum
                     throw new UserFriendlyException(DiscussConst.私密);
                 }
             }
+            if (discuss.PermissionType == DiscussPermissionTypeEnum.User)
+            {
+                if (discuss.CreatorId != _currentUser.Id && !discuss.PermissionUserIds.Contains(_currentUser.Id))
+                {
+                    throw new UserFriendlyException(DiscussConst.私密);
+                }
+            }
         }
     }
 }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/DiscussConst.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/DiscussConst.cs
index 99c57c46..99cad730 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/DiscussConst.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/DiscussConst.cs
@@ -14,6 +14,6 @@ namespace Yi.BBS.Domain.Shared.Forum.ConstClasses
     {
         public const string 主题不存在 = "传入的主题id不存在";
 
-        public const string 私密 = "【私密】您无该主题权限";
+        public const string 私密 = "【私密】您无该主题权限，可联系作者申请开放";
     }
 }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml
index 7331f9e1..1882b0e9 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml
@@ -51,6 +51,11 @@
             封面
             </summary>
         </member>
+        <member name="P:Yi.BBS.Domain.Forum.Entities.DiscussEntity.PermissionUserIds">
+            <summary>
+            当PermissionType为部分用户时候，以下列表中的用户+创建者 代表拥有权限
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Domain.Forum.ForumManager">
             <summary>
             论坛模块的领域服务
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/DiscussEntity.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/DiscussEntity.cs
index f55c037e..52eccc80 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/DiscussEntity.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/DiscussEntity.cs
@@ -54,5 +54,12 @@ namespace Yi.BBS.Domain.Forum.Entities
         public long? LastModifierId { get; set; }
 
         public DateTime? LastModificationTime { get; set; }
+
+
+        /// <summary>
+        /// 当PermissionType为部分用户时候，以下列表中的用户+创建者 代表拥有权限
+        /// </summary>
+        [SugarColumn(IsJson = true)]//使用json处理
+        public List<long> PermissionUserIds { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db
index c7d77eefd37e4695e06c65836c19d600c948366e..329d4b552dd78b273b9ccbbe9d1ec7957f024e4a 100644
GIT binary patch
delta 2766
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

delta 1214
zcmZ{jZD<@t7{_OJclLJgc6TnRcj+b6#GIGZwzrv?eP1y|lcHbDiP|W%y|y4FzElfR
zXam|L+6Kkq#nx`BLNQt`qE?Brf`pzSh=|1$G$BQ(U$hn~RBAq`RGquDG#?c9*=2d&
ze$RiN8LnoAtC>o3qcjTu7~r;v8|2nIzJUqS?8x>{x5KxedP};mt+@eS2Dl3Y{T>~r
zE~Tc`@70sa56Z{za(r_Io`Q$l()r}`Poxq}EiLecu6SV_J|e{BBXHM6OlU~$kh-Sp
z+RU-ybI%CtMpq}bA%IWflJT1n8QuCX`XQZY3);|BL%OWRLz?)a7)w<+isOT=;<H37
z>Yp7>R5x??fFAAt7NU51t9W;#IIIrGiQOWE+_P7S()&adAJ`|3bm*RdE4V0l`qw(v
z-fh?op^)0cquOEalRhykQ@wDf0)O5J6xjlDuc`n`iAs}V56r}sN%40T4#XEe5c^<m
zv@B(1Pk*im6u2TBDDm<4#oJ)(OEYP}2(yaBDl)f?kdRuT?U?~#Zb004{V8#=l9r4U
z5I<;~z&YbQ{?d4yqda8j_z(ztWjT9#Au%x%?I=mBnk?V6UEjBCJNx0$H81nx*@^dd
z9*8FUrM+uaB-g^L=kcnQU7a@Sg_JAJOlsSn?L~K$q<;8xG+vUrH+H{%bY*ZIk@%q%
zm>#tq%7Se5>^HBCE;p)8lf)N*gr@*Lho|rvT*X)LJDm3wTyyBxU_aU>wXeShqH3ZH
zv!~~;{>ZB&_!8x^pa0Q+k(a7FzNitzSGP$CqDjgiFmf78-m47qnhz`S;DmH+tP82&
zCczX9Pyb5aqc>}_+GD9Flk>?w<%-giIG9KZCaMT?;$Pwxe82H3PyHK8Bdr@U5o<?d
zo34vbL*|Esn#?DZde(?)X5^Np96!1|KWVOAuc82;W~+1i3ql%Di&4s~`m_8+%RlvZ
zgga1E^j!z)OxM;p2pKhPJK%dvqb+%KTpCrnve7?zv^hF+D{`P1Nd@#kMAjm?%pB8Y
zHldzNT`O>G68Oya9nTItmvDvTN5NQ~OubHaM~zJRf3n1XlI3e;PUyHM3q}Tt8JXr<
z__RB2Oj}Z;=>qEHbUzi)V2w`FXh>YsaV_6sR<yMP-IC=<Z_0&yE!Vq|8=Y<EnL@Oy
z9rZ<*I*{JTSIrHH6B6I7W&4&BCp*!f%Iail3E(%dZOj=v4M9JmuhV9<a%zd6)M6@L
zx*cIj;!QxD=t1)s^J`++p+ilV5Sy^**Ai-qr5?11>-w!>{2KU<<NJPHKbJ8cM!AU0
G3E01~9VXNO

diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListInputVo.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListInputVo.cs
index 159f9358..5a3ffc49 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListInputVo.cs
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListInputVo.cs
@@ -18,5 +18,7 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
 
         public long? DeptId { get; set; }
 
+        public string? Ids { get; set; }
+
     }
 }
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs
index 91911800..cd65e3b4 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs
@@ -48,6 +48,8 @@ namespace Yi.RBAC.Application.Identity
 
             RefAsync<int> total = 0;
 
+
+            List<long>? ids = input.Ids?.Split(",").Select(x=>long.Parse(x)).ToList();
             var outPut = await _DbQueryable.WhereIF(!string.IsNullOrEmpty(input.UserName), x => x.UserName.Contains(input.UserName!))
                          .WhereIF(input.Phone is not null, x => x.Phone.ToString()!.Contains(input.Phone.ToString()!))
                           .WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name!.Contains(input.Name!))
@@ -56,6 +58,9 @@ namespace Yi.RBAC.Application.Identity
 
                           //这个为过滤当前部门，加入数据权限后，将由数据权限控制
                           .WhereIF(input.DeptId is not null, x => x.DeptId == input.DeptId)
+                          
+                          .WhereIF(ids is not null,x=> ids.Contains(x.Id))
+
 
                           .LeftJoin<DeptEntity>((user, dept) => user.DeptId == dept.Id)
                           .Select((user, dept) => new UserGetListOutputDto(), true)
diff --git a/Yi.RuoYi.Vue3/src/components/Pagination/index.vue b/Yi.RuoYi.Vue3/src/components/Pagination/index.vue
index 38de953f..11af9602 100644
--- a/Yi.RuoYi.Vue3/src/components/Pagination/index.vue
+++ b/Yi.RuoYi.Vue3/src/components/Pagination/index.vue
@@ -7,7 +7,7 @@
       :layout="layout"
       :page-sizes="pageSizes"
       :pager-count="pagerCount"
-      :total="total"
+      :total="Number(total)"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
diff --git a/Yi.RuoYi.Vue3/src/utils/request.js b/Yi.RuoYi.Vue3/src/utils/request.js
index 29dfbe0b..4832812e 100644
--- a/Yi.RuoYi.Vue3/src/utils/request.js
+++ b/Yi.RuoYi.Vue3/src/utils/request.js
@@ -28,6 +28,9 @@ const service = axios.create({
   }],
 })
 
+
+
+
 // request拦截器
 service.interceptors.request.use(config => {
   // 是否需要设置 token
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
index 78b54705..4c802781 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
@@ -180,7 +180,7 @@
     
         <pagination
           v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
index bedefe85..40af68a8 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
@@ -250,7 +250,7 @@
 
     <pagination
       v-show="total > 0"
-      :total="total"
+      :total="Number(total)"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
@@ -424,7 +424,7 @@
         </el-table>
         <pagination
           v-show="materialTotal > 0"
-          :total="materialTotal"
+          :total="Number(materialTotal) "
           v-model:page="queryMaterialParams.pageNum"
           v-model:limit="queryMaterialParams.pageSize"
           @pagination="getMaterialList"
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
index 70ae29ae..8ff6e8be 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
@@ -174,7 +174,7 @@
     
         <pagination
           v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
index 3d9564f8..d90bec66 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
@@ -182,7 +182,7 @@
     
         <pagination
           v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
index f5180285..75cd66e7 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
@@ -174,7 +174,7 @@
     
         <pagination
           v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue b/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
index 90d2d062..f23119cf 100644
--- a/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
@@ -174,7 +174,7 @@
     
         <pagination
           v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
           @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue b/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
index 79065cb0..6dd0d8b1 100644
--- a/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
@@ -188,7 +188,7 @@
 
     <pagination
       v-show="total > 0"
-      :total="total"
+      :total="Number(total)"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
index be65c336..e92e5645 100644
--- a/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
@@ -155,7 +155,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue b/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
index ac4497c7..9c9d06d6 100644
--- a/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
@@ -131,7 +131,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
index 4e2bc6af..ecb12a48 100644
--- a/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
@@ -115,7 +115,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
index a031b24e..4a26e625 100644
--- a/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
@@ -55,7 +55,7 @@
          </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
+      <pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
    </div>
 </template>
 
diff --git a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
index 915dd42b..b3522056 100644
--- a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
@@ -124,7 +124,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/config/index.vue b/Yi.RuoYi.Vue3/src/views/system/config/index.vue
index 45a985bc..31fb467b 100644
--- a/Yi.RuoYi.Vue3/src/views/system/config/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/config/index.vue
@@ -133,7 +133,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
index 3117d6bc..d4d5ee4c 100644
--- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
@@ -127,7 +127,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/index.vue b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
index 6e548ceb..60c69e35 100644
--- a/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
@@ -141,9 +141,10 @@
          </el-table-column>
       </el-table>
 
+
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/notice/index.vue b/Yi.RuoYi.Vue3/src/views/system/notice/index.vue
index ac0f5e66..a80baa5b 100644
--- a/Yi.RuoYi.Vue3/src/views/system/notice/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/notice/index.vue
@@ -111,7 +111,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/post/index.vue b/Yi.RuoYi.Vue3/src/views/system/post/index.vue
index 567ff366..d4f24251 100644
--- a/Yi.RuoYi.Vue3/src/views/system/post/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/post/index.vue
@@ -111,7 +111,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
index 4e4bceca..ef92df0d 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
@@ -87,7 +87,7 @@
 
       <pagination
          v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
index 63fe41ed..8033c59f 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
@@ -82,7 +82,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 添加或修改角色配置对话框 -->
diff --git a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
index 19d5d7cc..51c8585c 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
@@ -43,7 +43,7 @@
          </el-table>
          <pagination
             v-show="total > 0"
-            :total="total"
+            :total="Number(total)"
             v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize"
             @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue b/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
index 0b5c14bc..e5cfbf38 100644
--- a/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
@@ -34,7 +34,7 @@
          </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+      <pagination v-show="total > 0" :total="Number(total)" v-model:page="pageNum" v-model:limit="pageSize" />
 
       <el-form label-width="100px">
          <div style="text-align: center;margin-left:-120px;margin-top:30px;">
diff --git a/Yi.RuoYi.Vue3/src/views/system/user/index.vue b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
index 7869e9eb..5ad0a1ce 100644
--- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
@@ -107,7 +107,7 @@
                   </template>
                </el-table-column>
             </el-table>
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            <pagination v-show="total > 0"          :total="Number(total)" v-model:page="queryParams.pageNum"
                v-model:limit="queryParams.pageSize" @pagination="getList" />
          </el-col>
       </el-row>
diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
index 33b56337..a16f2a2b 100644
--- a/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
+++ b/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
@@ -33,7 +33,7 @@
       </el-table>
       <pagination
         v-show="total>0"
-        :total="total"
+        :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
diff --git a/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue b/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
index 24ba79cf..d75c6b87 100644
--- a/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
@@ -149,7 +149,7 @@
     </el-table>
     <pagination
       v-show="total>0"
-      :total="total"
+      :total="Number(total)"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"