From d44daabfeed9d8e3c6d53313cae7b5d6a441f6ff Mon Sep 17 00:00:00 2001
From: ccongli <1441652193@qq.com>
Date: Wed, 11 Oct 2023 13:53:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/user/UserController.java |   2 +-
 .../admin/user/UserProfileController.java     |  14 ++
 .../user/vo/profile/UserProfileRespVO.java    |  35 ++++
 .../vo/profile/UserProfileUpdateReqVO.java    |   2 +-
 yunxi-ui-admin-vben/.env                      |   6 +-
 yunxi-ui-admin-vben/src/utils/dict.ts         |   1 +
 .../src/views/system/user/user.data.ts        |  60 ++++++
 .../src/views/users/mine/index.vue            | 187 +++++++++++-------
 8 files changed, 230 insertions(+), 77 deletions(-)

diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java
index fc91ade4..e354df95 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java
@@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.Operation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -204,5 +205,4 @@ public class UserController {
         list.sort(Comparator.comparing(AdminUserDO::getId));
         return success(UserConvert.INSTANCE.convertList04(list));
     }
-
 }
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java
index c1f811d1..e7140571 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java
@@ -65,16 +65,30 @@ public class UserProfileController {
         // 获得用户角色
         List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
         resp.setRoles(UserConvert.INSTANCE.convertList(userRoles));
+        String deptNames = "";
         // 获得部门信息
         if (user.getDeptId() != null) {
             DeptDO dept = deptService.getDept(user.getDeptId());
             resp.setDept(UserConvert.INSTANCE.convert02(dept));
+            deptNames = deptNames + dept.getName() + ",";
         }
+        if(deptNames.length() > 0){
+            deptNames = deptNames.substring(0, deptNames.length() - 1);
+        }
+        resp.setDeptNames(deptNames);
+        String postNames = "";
         // 获得岗位信息
         if (CollUtil.isNotEmpty(user.getPostIds())) {
             List<PostDO> posts = postService.getPostList(user.getPostIds());
             resp.setPosts(UserConvert.INSTANCE.convertList02(posts));
+            for (PostDO postDO : posts) {
+                postNames = postNames + postDO.getName() + ",";
+            }
+        }
+        if(postNames.length() > 0){
+            postNames = postNames.substring(0, postNames.length() - 1);
         }
+        resp.setPostNames(postNames);
         // 获得社交用户信息
         List<SocialUserDO> socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue());
         resp.setSocialUsers(UserConvert.INSTANCE.convertList03(socialUsers));
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
index dad3c365..b376f812 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
@@ -33,6 +33,41 @@ public class UserProfileRespVO extends UserBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "事业部,传感部")
+    private String deptNames;
+
+    @Schema(description = "职务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "董事长,周经理")
+    private String postNames;
+
+    /**
+     * 籍贯
+     */
+    private String nativePlace;
+    /**
+     * 学历
+     */
+    private String education;
+    /**
+     * 专业
+     */
+    private String speciality;
+    /**
+     * 毕业院校
+     */
+    private String graduationInstitution;
+    /**
+     * 毕业时间
+     */
+    private LocalDateTime institutionDatatime;
+    /**
+     * 毕业时间
+     */
+    private LocalDateTime birthDatetime;
+    /**
+     * 个人简介
+     */
+    private String personalProfile;
+
     /**
      * 所属角色
      */
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
index efd41144..98cbed1b 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 用户个人信息更新 Request VO")
 @Data
-public class UserProfileUpdateReqVO {
+public class UserProfileUpdateReqVO extends UserProfileRespVO{
 
     @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @Size(max = 30, message = "用户昵称长度不能超过 30 个字符")
diff --git a/yunxi-ui-admin-vben/.env b/yunxi-ui-admin-vben/.env
index 5f9b194b..40b893df 100644
--- a/yunxi-ui-admin-vben/.env
+++ b/yunxi-ui-admin-vben/.env
@@ -1,11 +1,11 @@
 # 端口号
-VITE_PORT = 80
+VITE_PORT = 8090
 
 # 网站标题
-VITE_GLOB_APP_TITLE = 芋道管理系统
+VITE_GLOB_APP_TITLE = 云息Saas平台
 
 # 简称，用于配置文件名字 不要出现空格、数字开头等特殊字符
-VITE_GLOB_APP_SHORT_NAME = Yudao_Admin
+VITE_GLOB_APP_SHORT_NAME = Yunxi_Saas_Admin
 
 # 租户开关
 VITE_GLOB_APP_TENANT_ENABLE = true
diff --git a/yunxi-ui-admin-vben/src/utils/dict.ts b/yunxi-ui-admin-vben/src/utils/dict.ts
index 75a8f678..e7b0d1f1 100644
--- a/yunxi-ui-admin-vben/src/utils/dict.ts
+++ b/yunxi-ui-admin-vben/src/utils/dict.ts
@@ -169,4 +169,5 @@ export enum DICT_TYPE {
   industryClassify = 'industry_classify',   //客户星级
   customerSource = 'customer_source',   //客户星级
   enterpriseNature = 'enterprise_nature',   //客户星级
+  XUELI = 'XUELI',   //学历
 }
diff --git a/yunxi-ui-admin-vben/src/views/system/user/user.data.ts b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts
index 5c8b3a61..e0fca052 100644
--- a/yunxi-ui-admin-vben/src/views/system/user/user.data.ts
+++ b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts
@@ -154,6 +154,12 @@ export const formSchema: FormSchema[] = [
       handleTree: 'id',
     },
   },
+  {
+    label: '工号',
+    field: 'jobNumber',
+    required: true,
+    component: 'Input',
+  },
   {
     label: '手机号码',
     field: 'mobile',
@@ -161,6 +167,12 @@ export const formSchema: FormSchema[] = [
     defaultValue: 0,
     component: 'InputNumber',
   },
+  {
+    label: '微信号',
+    field: 'wechatAccount',
+    required: true,
+    component: 'Input',
+  },
   {
     label: '邮箱',
     field: 'email',
@@ -187,6 +199,54 @@ export const formSchema: FormSchema[] = [
       options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX),
     },
   },
+  {
+    label: '出生日期',
+    field: 'birthDatetime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: false,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '籍贯',
+    field: 'nativePlace',
+    component: 'Input',
+  },
+  {
+    label: '学历',
+    field: 'education',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.XUELI),
+    },
+  },
+  {
+    label: '专业',
+    field: 'speciality',
+    component: 'Input',
+  },
+  {
+    label: '毕业院校',
+    field: 'graduationInstitution',
+    component: 'Input',
+  },
+  {
+    label: '毕业时间',
+    field: 'institutionDatatime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: false,
+      format: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '个人简介',
+    field: 'personalProfile',
+    component: 'InputTextArea',
+  },
   {
     label: '岗位',
     field: 'postIds',
diff --git a/yunxi-ui-admin-vben/src/views/users/mine/index.vue b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
index f47166cc..1f69a5cb 100644
--- a/yunxi-ui-admin-vben/src/views/users/mine/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
   import {onMounted, reactive, ref, toRefs, getCurrentInstanc, getCurrentInstance} from 'vue'
 import type { UnwrapRef } from 'vue'
-
+import { message } from 'ant-design-vue';
   // let {proxy}=getCurrentInstanc
 import {
   FieldTimeOutlined,
@@ -12,10 +12,12 @@ import {
 } from '@ant-design/icons-vue'
 
 
-  import { getUserProfileApi, updateUserProfileApi, uploadAvatarApi } from '@/api/base/profile'
+  import { getUserProfileApi, updateUserProfileApi, uploadAvatarApi, updateUserPwdApi } from '@/api/base/profile'
+  import { useRender } from '@/components/Table'
+  import { useUserStore } from '@/store/modules/user'
   import { exportLoginLog, getLoginLogPage } from '@/api/system/loginLog'
   import { deleteNotice, getNoticePage } from '@/api/system/notice'
-
+const userStore = useUserStore()
 
 /* let userInfo = reactive({
 })
@@ -25,10 +27,10 @@ onMounted( async () => {
 }) */
 
 // 单选
-const sex = ref<string>('保密')//性别
+const sex = ref<string>('1')//性别
 
 
-const message = ref<string>('全部信息')//系统信息选择
+const message2 = ref<string>('全部信息')//系统信息选择
   
 interface FormState {
   name: string
@@ -52,7 +54,26 @@ const confirmLoading = ref<boolean>(false)
 function showModal() {
   open.value = true
 }
-
+const saveUser = async () => {
+  const result = await updateUserProfileApi(state.userInfo);
+  if(result){
+    message.success('修改成功');
+  }else{
+    message.error('修改失败');
+  }
+}
+const updatePassward = async () => {
+  if(state.userUpdatePasswordReqVO.newPassword != state.userUpdatePasswordReqVO.newPassword2){
+    message.error('新密码两次输入不一致');
+    return false
+  }
+  const result = await updateUserPwdApi(state.userUpdatePasswordReqVO.oldPassword, state.userUpdatePasswordReqVO.newPassword);
+  if(result){
+    message.success('修改成功');
+  }else{
+    message.error('修改失败');
+  }
+}
 function handleOk() {
   confirmLoading.value = true
   setTimeout(() => {
@@ -62,13 +83,23 @@ function handleOk() {
 }
 const state = reactive({
   checked1: true,
-  userInfo: {}
+  userInfo: {},
+  userUpdatePasswordReqVO: {
+    id: 100,
+    oldPassword: '',
+    newPassword: '',
+    newPassword2: '',
+  },
+  loginLog:[],
+  noticePage: [],
+  enterpriseList: [],
 })
 onMounted( async () => {
-  debugger
   state.userInfo = await getUserProfileApi()
-  console.log("55555555" + state.userInfo);
-  debugger
+  state.userUpdatePasswordReqVO.id = state.userInfo.id;
+  state.loginLog = await getLoginLogPage();
+  state.noticePage = await getNoticePage();
+  state.enterpriseList = userStore.getUserInfo.user.enterpriseList;
 })
 
 //分页器
@@ -121,18 +152,33 @@ const tablecolumns = [
   },
   {
     title: '状态',
-    dataIndex: 'state',
-    key: 'state',
+    dataIndex: 'status',
+    key: 'status',
+    customRender: ({ record }) => {
+      if (record == '1')
+        return "关闭"
+      else
+        return  "正常"
+    },
   },
   {
     title: '类型',
     key: 'type',
     dataIndex: 'type',
+    customRender: ({ record }) => {
+      if (record == '1')
+        return "通知"
+      else
+        return  "公告"
+    },
   },
   {
     title: '发布时间',
-    key: 'time',
-    dataIndex: 'time',
+    key: 'createTime',
+    dataIndex: 'createTime',
+    customRender: ({ text }) => {
+      return useRender.renderDate(text)
+    },
   },
 ]
 
@@ -182,23 +228,23 @@ const tabledata = [
             <div class="form">
               <a-form :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
                 <a-form-item label="登录账号：">
-                  <a-input v-model:value="state.userInfo.username" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.username" :disabled="true" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="姓名：">
-                  <a-input v-model:value="state.userInfo.nickname" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.nickname" :disabled="true" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="所属部门：">
-                  <a-input v-model:value="state.userInfo.dept.name" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.deptNames" :disabled="true" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="员工职务：">
-                  <a-input v-model:value="state.userInfo.posts[0].name" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.postNames" :disabled="true" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="员工工号：">
-                  <a-input v-model:value="state.userInfo.jobNumber" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.jobNumber" :disabled="true" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="手机号码：">
                   <div class="phonecss">
-                    <a-input v-model:value="state.userInfo.mobile" placeholder="输入内容" :style="phoneStyle" />
+                    <a-input v-model:value="state.userInfo.mobile" :disabled="true" placeholder="输入内容" :style="phoneStyle" />
                    
                     <div>
                       <a-button :style="changeStyle" @click="showModal">
@@ -228,26 +274,26 @@ const tabledata = [
                   </div>
                 </a-form-item>
                 <a-form-item label="微信账号：">
-                  <a-input v-model:value="value" placeholder="输入内容" />
+                  <a-input v-model:value="state.userInfo.wechatAccount" placeholder="输入内容" />
                 </a-form-item>
                 <a-form-item label="邮箱地址：">
-                  <a-input v-model:value="value" placeholder="输入内容" />
-                </a-form-item>
+                  <a-input v-model:value="state.userInfo.email" placeholder="输入内容" />
+                </a-form-item><!-- birthDatetime -->
                 <a-form-item name="DatePicker" label="出生日期" v-bind="config">
-                  <a-date-picker v-model:value="formState['date-picker']" value-format="YYYY-MM-DD" />
+                  <a-date-picker v-model:value="state.userInfo.birthDatetime" :format="dateFormat" valueFormat="x" />
                 </a-form-item>
                 <a-form-item label="性别：">
                   <div>
                     <div>
                       <div>
-                        <a-radio-group v-model:value="sex">
-                          <a-radio-button :style="customButtonStyle" value="男性">
+                        <a-radio-group v-model:value="state.userInfo.sex">
+                          <a-radio-button :style="customButtonStyle" :value="1">
                             男性<ManOutlined />
                           </a-radio-button>
-                          <a-radio-button :style="customButtonStyle" value="女性">
+                          <a-radio-button :style="customButtonStyle" :value="2">
                             女性<WomanOutlined />
                           </a-radio-button>
-                          <a-radio-button :style="customButtonStyle" value="保密">
+                          <a-radio-button :style="customButtonStyle" :value="0">
                             保密
                           </a-radio-button>
                         </a-radio-group>
@@ -262,44 +308,44 @@ const tabledata = [
             
                 <a-form label-width="100px" :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
                   <a-form-item label="籍贯：">
-                    <a-input v-model:value="value" placeholder="输入内容" />
+                    <a-input v-model:value="state.userInfo.nativePlace" placeholder="输入内容" />
                   </a-form-item>
-                  <a-form-item label="学历" name="region">
-                    <a-select v-model:value="formState.region" placeholder="选择学历">
-                      <a-select-option value="初中">
+                  <a-form-item label="学历" name="region"><!-- education -->
+                    <a-select v-model:value="state.userInfo.education" placeholder="选择学历">
+                      <a-select-option value="1">
                         初中
                       </a-select-option>
-                      <a-select-option value="高中">
+                      <a-select-option value="2">
                         高中
                       </a-select-option>
-                      <a-select-option value="初中">
+                      <a-select-option value="3">
                         大专
                       </a-select-option>
-                      <a-select-option value="高中">
+                      <a-select-option value="4">
                         本科
                       </a-select-option>
-                      <a-select-option value="初中">
+                      <a-select-option value="5">
                         研究生
                       </a-select-option>
-                      <a-select-option value="高中">
+                      <a-select-option value="6">
                         博士
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                   <a-form-item label="专业：">
-                    <a-input v-model:value="value" placeholder="输入内容" />
+                    <a-input v-model:value="state.userInfo.speciality" placeholder="输入内容" />
                   </a-form-item>
                   <a-form-item label="毕业院校：">
-                    <a-input v-model:value="value" placeholder="输入内容" />
-                  </a-form-item>
-                  <a-form-item name="毕业时间：" label="DatePicker" v-bind="config">
-                    <a-date-picker v-model:value="formState['date-picker']" value-format="YYYY-MM-DD" />
+                    <a-input v-model:value="state.userInfo.graduationInstitution" placeholder="输入内容" />
+                  </a-form-item><!-- institutionDatatime -->
+                  <a-form-item name="DatePicker" label="毕业时间：" v-bind="config">
+                    <a-date-picker v-model:value="state.userInfo.institutionDatatime" :format="dateFormat" valueFormat="x" />
                   </a-form-item>
                   <a-form-item label="个人简介：" placeholder="输入内容" name="desc">
-                    <a-textarea v-model:value="formState.desc" />
+                    <a-textarea v-model:value="state.userInfo.personalProfile" />
                   </a-form-item>
                   <a-form-item label="">
-                    <button class="save">
+                    <button class="save" @click="saveUser()">
                       保存
                     </button>
                   </a-form-item>
@@ -308,7 +354,7 @@ const tabledata = [
             </div>
             <div class="usepic">
               <div class="idpic">
-                <a-avatar :size="{ xs: 24, sm: 32, md: 40, lg: 64, xl: 80, xxl: 100 }">
+                <a-avatar :size="{ xs: 24, sm: 32, md: 40, lg: 64, xl: 80, xxl: 100 }" :src="state.userInfo.avatar">
                   <template #icon>
                     <UserOutlined />
                   </template>
@@ -346,24 +392,24 @@ const tabledata = [
           <div class="datumbox">
             <div class="form">
               <a-form :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
-                <a-form-item label="验证码：">
+                <!-- <a-form-item label="验证码：">
                   <div class="phonecss">
                     <a-input v-model:value="value" placeholder="输入内容" :style="phoneStyle" />
                     <a-button :style="changeStyle">
                       获取验证码
                     </a-button>
                   </div>
-                </a-form-item>
+                </a-form-item> -->
                 <a-form-item label="原密码：">
-                  <a-input v-model:value="value" placeholder="输入原密码" />
+                  <a-input v-model:value="state.userUpdatePasswordReqVO.oldPassword" placeholder="输入原密码" />
                 </a-form-item>
                 <a-form-item label="新密码：">
-                  <a-input v-model:value="value" placeholder="输入新密码" />
+                  <a-input v-model:value="state.userUpdatePasswordReqVO.newPassword" placeholder="输入新密码" />
                 </a-form-item>
                 <a-form-item label="新密码：">
-                  <a-input v-model:value="value" placeholder="输入确认新密码" />
+                  <a-input v-model:value="state.userUpdatePasswordReqVO.newPassword2" placeholder="输入确认新密码" />
                 </a-form-item>
-                <button class="save">
+                <button class="save" @click="updatePassward()">
                   保存
                 </button>
               </a-form>
@@ -382,14 +428,14 @@ const tabledata = [
             </p>
           </div>
           <!-- 日期 -->
-          <div
-            v-for="(item, index) in 5" :key="index"
-          >
-            <div class="date">
+          <!-- <div
+            v-for="(item, index) in state.loginLog" :key="index"
+          > -->
+            <!-- <div class="date">
               {{ `2023-08-22` }}
-            </div>
+            </div> -->
             <div
-              v-for="(item, index) in 5"
+              v-for="(item, index) in state.loginLog.list"
               :key="index" class="recordbox"
             >
               <div class="recordleft">
@@ -400,16 +446,16 @@ const tabledata = [
                   <div class="usersId">
                     {{ `kang-pc` }}
                   </div>
-                  {{ `上海市长宁区  14.127.100.242` }}
+                  {{ `上海市长宁区` + item.userIp}}
                 </div>
               </div>
               <div class="recordright">
-                <span><FieldTimeOutlined /></span>{{ `2023-08-22 12:00` }}
+                <span><FieldTimeOutlined /></span>{{new Date(item.createTime).toLocaleString()}}
               </div>
-            </div>
+            <!-- </div> -->
           </div>
           <div class="sorter">
-            <a-pagination v-model:current="current" :total="500" />
+            <a-pagination v-model:current="current" :total="state.loginLog.total" />
           </div>
         </div>
       </a-tab-pane>
@@ -426,7 +472,7 @@ const tabledata = [
           </div>
           <div class="messagetitle">
             <div class="messagetitleleft">
-              <a-radio-group v-model:value="message">
+              <a-radio-group v-model:value="message2">
                 <a-radio-button :style="messageStyle" value="全部信息">
                   全部信息
                 </a-radio-button>
@@ -453,7 +499,7 @@ const tabledata = [
           </div>
 
           <div class="table">
-            <a-table :columns="tablecolumns" :data-source="tabledata" :total="500">
+            <a-table :columns="tablecolumns" :data-source="state.noticePage.list" :total="state.noticePage.total">
               <template #headerCell="{ column }">
                 <template v-if="column.key === 'title'">
                   <span>
@@ -462,8 +508,8 @@ const tabledata = [
                 </template>
               </template>
               <template #bodyCell="{ column, record }">
-                <template v-if="column.key === 'name'">
-                  <a href=""> {{ record.name }}</a>
+                <template v-if="column.key === 'title'">
+                  <a href=""> {{ record.title }}</a>
                 </template>
                 
                 <template v-else-if="column.key === 'title'">
@@ -543,16 +589,16 @@ const tabledata = [
 
           <div class="listmainbox">
             <div class="listmain">
-              <div v-for="(item, index) in 4" :key="index" class="list">
+              <div v-for="(item, index) in state.enterpriseList" :key="index" class="list">
                 <div class="firm">
                   <div class="firmtop">
                     <div class="firmtopleft">
                       <img src="https://files.axshare.com/gsc/F4557Q/03/bb/8b/03bb8b5afc694032b44452387757f019/images/%E5%85%AC%E5%8F%B8%E5%88%97%E8%A1%A8/u30.png?pageId=125c1eb4-7fa5-4390-86d9-40ffd2c7d87c" alt="">
                     </div>
                     <div class="firmtopright">
-                      <p>{{ `济钢城市矿产科技有限公司` }}</p>
+                      <p>{{ item.name }}</p>
                       <p class="fontcss">
-                        职务：{{ `产品经理` }}
+                        职务：{{ item.position }}
                       </p>
                     </div>
                   </div>
@@ -579,7 +625,7 @@ const tabledata = [
               </div>
             </div>
             <div class="sorter">
-              <a-pagination v-model:current="current" :total="50" show-less-items />
+              <a-pagination v-model:current="current" :total="state.enterpriseList.length" show-less-items />
             </div>
           </div>
         </div>
@@ -909,6 +955,3 @@ justify-content: space-between;
   border-inline-start: 1px solid #d9d9d9;
 }
 </style>
-
-
-

From ea749f59e7626f5a165c815889a0c206a604b402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Wed, 11 Oct 2023 14:44:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/dept/DeptController.java | 15 ++----
 .../admin/dept/vo/dept/DeptSimpleRespVO.java  |  3 ++
 .../system/dal/dataobject/dept/DeptDO.java    |  5 +-
 .../system/service/dept/DeptService.java      |  4 +-
 .../system/service/dept/DeptServiceImpl.java  | 47 ++++++++++++++-----
 5 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java
index f4c7c952..c0a4701a 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java
@@ -131,19 +131,10 @@ public class DeptController {
         //将Dept转化为简单的Dept
         List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>();
         simpleDeptList.addAll(DeptConvert.INSTANCE.convertList02(deptDOList));
-        deptDOList.forEach(deptDO -> {
-            List<AdminUserDO> adminUserList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
-            for (AdminUserDO adminUserDO : adminUserList){
-                DeptSimpleRespVO deptSimpleRespVO = new DeptSimpleRespVO();
-                deptSimpleRespVO.setId(adminUserDO.getId());
-                deptSimpleRespVO.setParentId(adminUserDO.getDeptId());
-                deptSimpleRespVO.setName(adminUserDO.getNickname());
-                simpleDeptList.add(deptSimpleRespVO);
-            }
-        });
         //将list转为树状
-//        List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
-        return success(simpleDeptList);
+        List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
+        List<DeptSimpleRespVO> result = deptService.setBuildTree(list,0);
+        return success(result);
     }
 
 }
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
index a9b1ba5f..5cea32ca 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
@@ -24,5 +24,8 @@ public class DeptSimpleRespVO {
     @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long parentId;
 
+    @Schema(description = "子集" )
+    private List<DeptSimpleRespVO> children;
+
 
 }
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java
index 624bf803..e5628ca1 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
 import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
 import com.yunxi.scm.module.system.controller.admin.auth.vo.AuthPermissionInfoRespVO;
+import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -71,8 +72,8 @@ public class DeptDO extends TenantBaseDO {
      */
     private Long enterpriseId;
 
-//    @TableField(exist = false)
-//    private List children;
+    @TableField(exist = false)
+    private List<DeptSimpleRespVO> children;
 
 
 }
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java
index 17dc4282..aa461177 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java
@@ -107,5 +107,7 @@ public interface DeptService {
      * 组装为树形结构
      *
      */
-//    List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid);
+    List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid);
+
+    List<DeptSimpleRespVO> setBuildTree(List<DeptSimpleRespVO> deptDOList, long pid);
 }
diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java
index 8afe295e..f02cb49b 100644
--- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java
+++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java
@@ -19,6 +19,7 @@ import com.yunxi.scm.module.system.service.user.AdminUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -41,6 +42,9 @@ public class DeptServiceImpl implements DeptService {
 
     @Resource
     private DeptMapper deptMapper;
+    @Resource
+    @Lazy
+    private AdminUserService userService;
 
     @Override
     @CacheEvict(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST,
@@ -205,17 +209,38 @@ public class DeptServiceImpl implements DeptService {
         });
     }
 
-//    @Override
-//    public List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
-//        List<DeptSimpleRespVO> treeList = new ArrayList<>();
-//        for (DeptSimpleRespVO dept : deptDOList) {
-//            if (dept.getParentId() == pid) {
-//                dept.setChildren(buildTree(deptDOList, dept.getId()));
-//                treeList.add(dept);
-//            }
-//        }
-//        return treeList;
-//    }
+    @Override
+    public List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
+        List<DeptSimpleRespVO> treeList = new ArrayList<>();
+        for (DeptSimpleRespVO dept : deptDOList) {
+            if (dept.getParentId() == pid) {
+                dept.setChildren(buildTree(deptDOList, dept.getId()));
+                treeList.add(dept);
+            }
+        }
+        return treeList;
+    }
+
+    @Override
+    public List<DeptSimpleRespVO> setBuildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
+        for (DeptSimpleRespVO dept : deptDOList) {
+            if (dept.getChildren() != null && dept.getChildren().size() > 0) {
+                setBuildTree(dept.getChildren(), dept.getId());
+            } else {
+                List<AdminUserDO> adminUserList = userService.getUserListByDeptIds(Collections.singleton(dept.getId()));
+                List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>();
+                for (AdminUserDO adminUserDO : adminUserList) {
+                    DeptSimpleRespVO deptSimpleRespVO = new DeptSimpleRespVO();
+                    deptSimpleRespVO.setId(adminUserDO.getId());
+                    deptSimpleRespVO.setParentId(adminUserDO.getDeptId());
+                    deptSimpleRespVO.setName(adminUserDO.getNickname());
+                    simpleDeptList.add(deptSimpleRespVO);
+                }
+                dept.setChildren(simpleDeptList);
+            }
+        }
+        return deptDOList;
+    }
 
 
 }

From 7b8cc06e2814582b28cf38f90cc96e7e3b27b567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Wed, 11 Oct 2023 15:01:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BA=BF=E6=A0=91=E7=8A=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/xxjj/businessWarehouse/index.ts      | 16 ++++++++--------
 .../xxjj/businessOrganizationConfig/index.vue    |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/yunxi-ui-admin-vben/src/api/xxjj/businessWarehouse/index.ts b/yunxi-ui-admin-vben/src/api/xxjj/businessWarehouse/index.ts
index 29ea9229..c5d9edcf 100644
--- a/yunxi-ui-admin-vben/src/api/xxjj/businessWarehouse/index.ts
+++ b/yunxi-ui-admin-vben/src/api/xxjj/businessWarehouse/index.ts
@@ -33,19 +33,19 @@ export function exportBusinessWarehouse(params) {
 
 // 查询业务线（精简)列表
 export function listSimpleBusiness() {
-   return  defHttp.get({ url: '/system/business-warehouse/list-all-simple' })
+    return defHttp.get({ url: '/system/business-warehouse/list-all-simple' })
 }
 
-  // 查询业务线列表
+// 查询业务线列表
 export function getBusinessPage(params) {
     return defHttp.get({ url: '/system/business-warehouse/business', params })
 }
 
-  // 查询业务组织列表
-  export function getBusinessUserList(params) {
+// 查询业务组织列表
+export function getBusinessUserList(params) {
     return defHttp.get({ url: '/system/business-warehouse/business-user', params })
 }
-
-export function getDeptUserList() {
-    return defHttp.get({ url: '/system/dept/list-dept-user'})
-}
+// //查询业务组织配置列表
+// export function getDeptUserList() {
+//     return defHttp.get({ url: '/system/dept/list-dept-user' })
+// }
diff --git a/yunxi-ui-admin-vben/src/views/xxjj/businessOrganizationConfig/index.vue b/yunxi-ui-admin-vben/src/views/xxjj/businessOrganizationConfig/index.vue
index 083a188e..8bb2e32f 100644
--- a/yunxi-ui-admin-vben/src/views/xxjj/businessOrganizationConfig/index.vue
+++ b/yunxi-ui-admin-vben/src/views/xxjj/businessOrganizationConfig/index.vue
@@ -42,7 +42,7 @@ import { useModal } from '@/components/Modal'
 import BusinessWarehouseModal from './BusinessWarehouseModal.vue'
 import { IconEnum } from '@/enums/appEnum'
 import { BasicTable, useTable, TableAction } from '@/components/Table'
-import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage, getBusinessUserList, getDeptUserList } from '@/api/xxjj/businessWarehouse'
+import { deleteBusinessWarehouse, exportBusinessWarehouse, getBusinessWarehousePage, getBusinessUserList } from '@/api/xxjj/businessWarehouse'
 import { columns, searchFormSchema } from './businessWarehouse.data'
 import BusinessTree from './BusinessTree.vue'
 
@@ -53,8 +53,8 @@ const { createConfirm, createMessage } = useMessage()
 const [registerModal, { openModal }] = useModal()
 const searchInfo = reactive<Recordable>({})
 
-const deptList = await getDeptUserList();
-console.log('deptList',deptList)
+// const deptList = await getDeptUserList();
+// console.log('deptList',deptList)
 
 const [registerTable, { getForm, reload }] = useTable({
   title: '业务组织配置列表',