From 8ea9463705d26f07a279bab974769a5ceed43415 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 14:23:01 +0800
Subject: [PATCH] 最新版本

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java              |    2 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java              |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java               |    6 
 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java                |    2 
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java           |    4 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java              |   15 +
 server/system_service/src/main/java/com/doumee/api/system/SystemController.java                      |    4 
 server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java           |    2 
 server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java                |    2 
 server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java            |   13 
 admin/.env.development                                                                               |    2 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java              |    4 
 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java                |    2 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java        |    2 
 server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java              |    7 
 server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java                  |   13 +
 server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java                  |   16 +
 server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java            |    7 
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java             |    4 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java          |    2 
 server/system_service/src/main/java/com/doumee/api/BaseController.java                               |   11 -
 admin/src/components/business/OperaInternalCompanyWindow.vue                                         |   58 ++++++
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java          |    4 
 server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java        |    7 
 server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java              |    7 
 /dev/null                                                                                            |  141 -----------------
 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java                |    1 
 admin/src/views/business/internalCompany.vue                                                         |   23 ++
 server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java                  |   15 +
 server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java        |    8 
 admin/.env.test                                                                                      |    2 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java    |    2 
 server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java          |    2 
 admin/src/api/business/company.js                                                                    |   16 +
 server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java                  |    7 
 server/system_gateway/src/main/resources/application.yml                                             |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java |   49 +++--
 37 files changed, 228 insertions(+), 240 deletions(-)

diff --git a/admin/.env.development b/admin/.env.development
index ef1bcb5..0d5ccaa 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,3 +1,3 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
-VUE_APP_API_URL  = 'http://192.168.0.109:10010'
+VUE_APP_API_URL  = 'http://localhost:10010'
diff --git a/admin/.env.test b/admin/.env.test
index c45c4ce..7ee9ad9 100644
--- a/admin/.env.test
+++ b/admin/.env.test
@@ -1,4 +1,4 @@
 # 娴嬭瘯鐜閰嶇疆
 NODE_ENV = 'production'
 
-VUE_APP_API_URL  = 'http://192.168.0.109:10010'
+VUE_APP_API_URL  = 'http://192.168.0.150:10010'
diff --git a/admin/src/api/business/company.js b/admin/src/api/business/company.js
index 981ee37..b1b1863 100644
--- a/admin/src/api/business/company.js
+++ b/admin/src/api/business/company.js
@@ -2,9 +2,16 @@
 
 // 鏌ヨ
 export function fetchList (type) {
-  return request.get(`/visitsAdmin/cloudService/business/company/tree?type=${type}`, {
-    trim: true
-  })
+  if(type !=null && type != undefined){
+    return request.get(`/visitsAdmin/cloudService/business/company/tree?type=${type}`, {
+      trim: true
+    })
+  }else{
+    return request.get(`/visitsAdmin/cloudService/business/company/tree`, {
+      trim: true
+    })
+  }
+
 }
 
 // export function fetchList (data) {
@@ -22,6 +29,9 @@
 export function updateById (data) {
   return request.post('/visitsAdmin/cloudService/business/company/updateById', data)
 }
+export function sort (data) {
+  return request.post('/visitsAdmin/cloudService/business/company/updateSort', data)
+}
 
 // 閮ㄩ棬淇℃伅鍚屾
 export function companySync (data) {
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index 082e5d2..34d1b87 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -6,12 +6,21 @@
         @confirm="confirm"
     >
         <el-form :model="form" ref="form" :rules="rules">
-            <el-form-item label="涓婄骇缁勭粐" prop="parentId">
-                <companySelect v-if="visible" v-model="form.parentId" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" clearable :inline="false"/>
+            <el-form-item label="涓婄骇缁勭粐"  >
+<!--
+                <companySelect v-if="!form.id " v-model="form.parentId" placeholder="璇烽�夋嫨涓婄骇鑿滃崟" clearable :inline="false"/>
+-->
+              <span>銆恵{form.parentName || '-'}}銆�</span>
             </el-form-item>
             <el-form-item label="缁勭粐鍚嶇О" prop="name">
                 <el-input v-model="form.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" v-trim/>
             </el-form-item>
+          <el-form-item label="缁勭粐绫诲瀷" prop="type">
+            <el-radio-group v-model="form.type" >
+              <el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>
+              <el-radio :label="1">鍐呴儴缁勭粐</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
     </GlobalWindow>
 </template>
@@ -30,14 +39,19 @@
       // 琛ㄥ崟鏁版嵁
       form: {
         id: null,
+        type: '0',
         name: '',
-        parentId: [],
-        disable: false
+        parentId: null,
+        disable: false,
+        parentName: ''
       },
       // 楠岃瘉瑙勫垯
       rules: {
         name: [
           { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�' }
+        ],
+        type: [
+          { required: true, message: '璇烽�夋嫨缁勭粐绫诲瀷' }
         ]
       }
     }
@@ -54,6 +68,38 @@
     })
   },
   methods: {
+    open(title,target,row){
+      this.title =title
+      this.visible =true
+      console.log(target)
+      this.form= {
+        id: null,
+        type: 0,
+        name: '',
+        parentId: null,
+        disable: false,
+        parentName: ''
+      }
+      if (target != null) {
+        this.form.parentId = target.id
+        this.form.parentName = target.companyPath
+      }
+      // 鏂板缓缁勭粐
+      if (row == null) {
+        this.$nextTick(() => {
+          this.$refs.form.resetFields()
+          this.form[this.configData['field.id']] = null
+        })
+        return
+      }
+      // 缂栬緫
+      this.$nextTick(() => {
+        this.originPermissionCode = target.code
+        for (const key in this.form) {
+          this.form[key] = row[key]
+        }
+      })
+    },
     // 纭鏂板缓/淇敼
     confirm () {
       this.$refs.form.validate((valid) => {
@@ -66,7 +112,7 @@
           this.api.create({
             parentId: this.form.parentId,
             name: this.form.name,
-            type: 1
+            type: this.form.type
           })
             .then(() => {
               this.visible = false
@@ -84,7 +130,7 @@
             id: this.form.id,
             parentId: this.form.parentId,
             name: this.form.name,
-            type: 1
+            type: this.form.type
           })
             .then(() => {
               this.visible = false
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 61bd140..141cb20 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -17,8 +17,10 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
-               <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>
-<!--                <li><el-button type="primary"  v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>-->
+               <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟',null,null)">鏂板缓</el-button></li>
+              <li><el-button @click="sort('top')" :loading="isWorking.sort" icon="el-icon-sort-up" v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
+              <li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['business:company:sort']">涓嬬Щ</el-button></li>
+              <!--<li><el-button type="primary"  v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>-->
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -31,15 +33,23 @@
             >
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
-                <el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
+                <el-table-column prop="name" label="缁勭粐绫诲瀷" min-width="100px">
+                  <template scope="{row}">
+                      <span v-if="row.type == 0">鐩稿叧鏂圭粍缁�</span>
+                      <span v-if="row.type == 1">鍐呴儴缁勭粐</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="companyPath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
+              <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+              <el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
                 <el-table-column
                     label="鎿嶄綔"
                     width="230"
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
-                        <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', { disable: true, parentId: row.id })" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
+                        <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅',{  id: row.parentId,name:row.parentName,companyPath:row.parentCompanyPath}, row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+                        <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇',  row,null)" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
                         <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
@@ -55,7 +65,6 @@
 import TableLayout from '@/layouts/TableLayout'
 import { companySync } from '@/api/business/company'
 import OperaInternalCompanyWindow from '@/components/business/OperaInternalCompanyWindow'
-import { memberSync } from '@/api/business/member'
 export default {
   name: 'internalCompany',
   extends: BaseTable,
@@ -65,7 +74,7 @@
       // 鎼滅储
       loading:false,
       searchForm: {
-        type: 1
+        // type: 1
       },
       list: [],
       total: 0
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/NoticesController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/NoticesController.java
deleted file mode 100644
index 6f3811e..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/NoticesController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
-import com.doumee.dao.system.model.Notices;
-import com.doumee.service.system.NoticesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/01/16 10:03
- */
-@Api(tags = "绯荤粺娑堟伅淇℃伅琛�")
-@RestController
-@RequestMapping("/business/notices")
-public class NoticesController extends BaseController {
-
-    @Autowired
-    private NoticesService noticesService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("business:notices:create")
-    public ApiResponse create(@RequestBody Notices notices) {
-        return ApiResponse.success(noticesService.create(notices));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("business:notices:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        noticesService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("business:notices:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        noticesService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏍规嵁ID淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("business:notices:update")
-    public ApiResponse updateById(@RequestBody Notices notices) {
-        noticesService.updateById(notices);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("business:notices:query")
-    public ApiResponse<PageData<Notices>> findPage (@RequestBody PageWrap<Notices> pageWrap) {
-        pageWrap.getModel().setPalt(Constants.ZERO);
-        return ApiResponse.success(noticesService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("business:notices:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<Notices> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(Notices.class).export(noticesService.findPage(pageWrap).getRecords(), "绯荤粺娑堟伅淇℃伅琛�", response);
-    }
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("business:notices:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(noticesService.findById(id));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemController.java
deleted file mode 100644
index 8b7ba74..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemUserBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.system.dto.LoginDTO;
-import com.doumee.dao.system.dto.UpdatePwdDto;
-import com.doumee.service.system.SystemLoginService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺鍔熻兘")
-@Trace(exclude = true)
-@Slf4j
-@RestController
-@RequestMapping("/system")
-public class SystemController extends BaseController {
-
-    @Autowired
-    private SystemUserBiz systemUserBiz;
-
-    @Autowired
-    private SystemLoginService systemLoginService;
-
-    @PreventRepeat(limit = 10, lockTime = 10000)
-    @ApiOperation("鐧诲綍")
-    @PostMapping("/login")
-    public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
-        return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
-    }
-
-    @ApiOperation("閫�鍑虹櫥褰�")
-    @PostMapping("/logout")
-    public ApiResponse logout () {
-        Subject subject = SecurityUtils.getSubject();
-        subject.logout();
-        return ApiResponse.success(null);
-    }
-
-    @Trace(withRequestParameters = false)
-    @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
-    @PostMapping("/updatePwd")
-    public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
-        dto.setUserId(this.getLoginUser().getId());
-        systemUserBiz.updatePwd(dto);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
-    @GetMapping("/getUserInfo")
-    public ApiResponse<LoginUserInfo> getUserInfo () {
-        return ApiResponse.success(this.getLoginUser());
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDataPermissionController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
deleted file mode 100644
index fcb5b7c..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemDataPermissionBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.DataPermissionConstants;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.model.SystemDataPermission;
-import com.doumee.dao.system.vo.SystemDataPermissionListVO;
-import com.doumee.service.system.SystemDataPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@RestController
-@RequestMapping("/system/dataPermission")
-@Api(tags = "绯荤粺鏁版嵁鏉冮檺")
-public class SystemDataPermissionController extends BaseController {
-
-    @Autowired
-    private SystemDataPermissionService systemDataPermissionService;
-
-    @Autowired
-    private SystemDataPermissionBiz systemDataPermissionBiz;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:datapermission:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission) {
-        return ApiResponse.success(systemDataPermissionBiz.create(systemDataPermission));
-    }
-
-    @ApiOperation("鏍规嵁ID鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:datapermission:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemDataPermissionService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:datapermission:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemDataPermissionService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:datapermission:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission) {
-        systemDataPermissionBiz.update(systemDataPermission);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼鐘舵��")
-    @PostMapping("/updateStatus")
-    @RequiresPermissions("system:datapermission:update")
-    public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemDataPermission systemDataPermission) {
-        systemDataPermissionBiz.updateStatus(systemDataPermission);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:datapermission:query")
-    public ApiResponse<PageData<SystemDataPermissionListVO>> findPage (@RequestBody PageWrap<SystemDataPermission> pageWrap) {
-        return ApiResponse.success(systemDataPermissionService.findPage(pageWrap));
-    }
-
-    @Trace(exclude = true)
-    @ApiOperation("鏌ヨ鏁版嵁鏉冮檺绫诲瀷")
-    @GetMapping("/types")
-    public ApiResponse<List<Map<String, Object>>> findTypes () {
-        return ApiResponse.success(DataPermissionConstants.Type.valueList());
-    }
-
-    @Trace(exclude = true)
-    @ApiOperation("鏌ヨ鏁版嵁鏉冮檺妯″潡")
-    @GetMapping("/modules")
-    public ApiResponse<List<Map<String, Object>>> findModules () {
-        return ApiResponse.success(DataPermissionConstants.Module.valueList());
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDepartmentController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDepartmentController.java
deleted file mode 100644
index f013ef7..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDepartmentController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemDepartmentBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.vo.SystemDepartmentListVO;
-import com.doumee.dao.system.vo.SystemUserListVO;
-import com.doumee.service.system.SystemUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "閮ㄩ棬")
-@RestController
-@RequestMapping("/system/department")
-public class SystemDepartmentController extends BaseController {
-
-    @Autowired
-    private SystemDepartmentBiz systemDepartmentBiz;
-
-    @Autowired
-    private SystemUserService systemUserService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:department:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
-        return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:department:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemDepartmentBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @PreventRepeat
-    @RequiresPermissions("system:department:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemDepartmentBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:department:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
-        systemDepartmentBiz.updateById(systemDepartment);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃")
-    @PostMapping("/tree")
-    @RequiresPermissions("system:department:query")
-    public ApiResponse<List<SystemDepartmentListVO>> findTree () {
-        return ApiResponse.success(systemDepartmentBiz.findTree());
-    }
-
-    @ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃鍙婇儴闂ㄤ笅鐨勪汉鍛�")
-    @GetMapping("/findTreeUser")
-    @RequiresPermissions("system:department:query")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentId", value = "parentId", paramType = "query", dataType = "Integer"),
-    })
-    public ApiResponse<SystemDepartmentListVO> findTreeUser(Integer parentId) {
-        return ApiResponse.success(systemDepartmentBiz.findTreeUser(parentId));
-    }
-
-    @Trace(exclude = true)
-    @ApiOperation("鏌ヨ閮ㄩ棬浜哄憳")
-    @PostMapping("/users")
-    @RequiresPermissions("system:department:queryUsers")
-    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
-        return ApiResponse.success(systemUserService.findPage(pageWrap));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictController.java
deleted file mode 100644
index 71a297a..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemDictBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemDictDTO;
-import com.doumee.dao.system.model.SystemDict;
-import com.doumee.dao.system.vo.SystemDictListVO;
-import com.doumee.service.system.SystemDictService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺瀛楀吀")
-@RestController
-@RequestMapping("/system/dict")
-public class SystemDictController extends BaseController {
-
-    @Autowired
-    private SystemDictService systemDictService;
-
-    @Autowired
-    private SystemDictBiz systemDictBiz;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:dict:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDict systemDict) {
-        return ApiResponse.success(systemDictBiz.create(systemDict));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:dict:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemDictService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:dict:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemDictService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:dict:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDict systemDict) {
-        systemDictBiz.updateById(systemDict);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:dict:query")
-    public ApiResponse<PageData<SystemDictListVO>> findPage (@RequestBody PageWrap<QuerySystemDictDTO> pageWrap) {
-        return ApiResponse.success(systemDictService.findPage(pageWrap));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
deleted file mode 100644
index 1b44045..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
-import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.dao.system.vo.SystemDictDataListVO;
-import com.doumee.service.system.SystemDictDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "瀛楀吀鏁版嵁")
-@RestController
-@RequestMapping("/system/dictData")
-public class SystemDictDataController extends BaseController {
-
-    @Autowired
-    private SystemDictDataService systemDictDataService;
-
-    @Autowired
-    private SystemDictDataBiz systemDictDataBiz;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:dict:update")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
-        return ApiResponse.success(systemDictDataBiz.create(systemDictData));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:dict:update")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemDictDataService.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:dict:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemDictDataService.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:dict:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
-        systemDictDataBiz.updateById(systemDictData);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:dict:update")
-    public ApiResponse<PageData<SystemDictDataListVO>> findPage (@RequestBody PageWrap<QuerySystemDictDataDTO> pageWrap) {
-        return ApiResponse.success(systemDictDataService.findPage(pageWrap));
-    }
-
-
-    @ApiOperation(value = "鏌ヨ瀛楀吀鍊兼暟鎹�" )
-    @GetMapping("/getSystemDictData")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "鏁版嵁瀛楀吀鍊糎5_LINK_ADDR", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "dictCode", value = "绯荤粺瀛楀吀鍊糞YSTEM", required = true)
-    })
-    public ApiResponse<SystemDictData> getSystemDictData(@RequestParam String dictCode, @RequestParam String label) {
-        return ApiResponse.success(systemDictDataBiz.queryByCode(dictCode,label));
-    }
-
-
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemLoginLogController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemLoginLogController.java
deleted file mode 100644
index 3949e25..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemLoginLogController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemLoginLogDTO;
-import com.doumee.dao.system.model.SystemLoginLog;
-import com.doumee.service.system.SystemLoginLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@RestController
-@RequestMapping("/system/loginLog")
-@Api(tags = "鐧诲綍鏃ュ織")
-public class SystemLoginLogController extends BaseController {
-
-    @Autowired
-    private SystemLoginLogService systemLoginLogService;
-
-    @PostMapping("/page")
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @RequiresPermissions("system:loginLog:query")
-    public ApiResponse<PageData<SystemLoginLog>> findPage (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap) {
-        return ApiResponse.success(systemLoginLogService.findPage(pageWrap));
-    }
-
-    @PostMapping("/exportExcel")
-    @ApiOperation("瀵煎嚭Excel")
-    @RequiresPermissions("system:loginLog:query")
-    public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SystemLoginLog.class).export(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織", response);
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMenuController.java
deleted file mode 100644
index 5e4cf01..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemMenuBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
-import com.doumee.dao.system.model.SystemMenu;
-import com.doumee.dao.system.vo.SystemMenuListVO;
-import com.doumee.dao.system.vo.SystemMenuNodeVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺鑿滃崟")
-@RestController
-@RequestMapping("/system/menu")
-public class SystemMenuController extends BaseController {
-
-    @Autowired
-    private SystemMenuBiz systemMenuBiz;
-
-    @ApiOperation("鑿滃崟鎺掑簭")
-    @PostMapping("/updateSort")
-    @RequiresPermissions("system:menu:sort")
-    public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto) {
-        systemMenuBiz.updateSort(dto);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏌ヨ鑿滃崟鏍�")
-    @GetMapping("/treeNodes")
-    public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
-        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
-    }
-
-    @ApiOperation("鏌ヨ鍒楄〃鏍�")
-    @PostMapping("/treeList")
-    @RequiresPermissions("system:menu:query")
-    public ApiResponse<List<SystemMenuListVO>> findTree () {
-        return ApiResponse.success(systemMenuBiz.findTree());
-    }
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:menu:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
-        return ApiResponse.success(systemMenuBiz.create(systemMenu));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:menu:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemMenuBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:menu:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemMenuBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:menu:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
-        systemMenuBiz.updateById(systemMenu);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼鑿滃崟鐘舵��")
-    @PostMapping("/updateStatus")
-    @RequiresPermissions("system:menu:update")
-    public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
-        systemMenuBiz.updateById(systemMenu);
-        return ApiResponse.success(null);
-    }
-
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMonitorController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMonitorController.java
deleted file mode 100644
index b16d68b..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMonitorController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.utils.Monitor;
-import com.doumee.core.utils.Utils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺鐩戝惉")
-@Trace(exclude = true)
-@RestController
-@RequestMapping("/system/monitor")
-public class SystemMonitorController extends BaseController {
-
-    @ApiOperation("鑾峰彇绯荤粺淇℃伅")
-    @GetMapping("/getSystemInfo")
-    @RequiresPermissions("system:monitor:query")
-    public ApiResponse<Monitor> getSystemInfo () {
-        return ApiResponse.success(Utils.Monitor.current());
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPermissionController.java
deleted file mode 100644
index 327e24a..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemPermissionBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
-import com.doumee.dao.system.model.SystemPermission;
-import com.doumee.dao.system.vo.SystemPermissionListVO;
-import com.doumee.service.system.SystemPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺鏉冮檺")
-@RestController
-@RequestMapping("/system/permission")
-public class SystemPermissionController extends BaseController {
-
-    @Autowired
-    private SystemPermissionService systemPermissionService;
-
-    @Autowired
-    private SystemPermissionBiz systemPermissionBiz;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:permission:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
-        return ApiResponse.success(systemPermissionBiz.create(systemPermission));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:permission:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemPermissionBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:permission:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemPermissionBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:permission:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
-        systemPermissionBiz.updateById(systemPermission);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:permission:query")
-    public ApiResponse<PageData<SystemPermissionListVO>> findPage (@RequestBody PageWrap<QuerySystemPermissionDTO> pageWrap) {
-        return ApiResponse.success(systemPermissionService.findPage(pageWrap));
-    }
-
-    @ApiOperation("鏌ヨ鎵�鏈�")
-    @GetMapping("/all")
-    @RequiresPermissions("system:permission:query")
-    public ApiResponse<List<SystemPermission>> findAll () {
-        SystemPermission systemPermission = new SystemPermission();
-        systemPermission.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemPermissionService.findList(systemPermission));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPositionController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPositionController.java
deleted file mode 100644
index 4670e06..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPositionController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemPositionBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.model.SystemPosition;
-import com.doumee.dao.system.vo.SystemPositionListVO;
-import com.doumee.dao.system.vo.SystemUserListVO;
-import com.doumee.service.system.SystemPositionService;
-import com.doumee.service.system.SystemUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 宀椾綅鎺ュ彛
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "宀椾綅")
-@RestController
-@RequestMapping("/system/position")
-public class SystemPositionController extends BaseController {
-
-    @Autowired
-    private SystemPositionService systemPositionService;
-
-    @Autowired
-    private SystemPositionBiz systemPositionBiz;
-
-    @Autowired
-    private SystemUserService systemUserService;
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:position:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) {
-        return ApiResponse.success(systemPositionBiz.create(systemPosition));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:position:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemPositionBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:position:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemPositionBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:position:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) {
-        systemPositionBiz.updateById(systemPosition);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鏌ヨ宀椾綅鏍戝垪琛�")
-    @PostMapping("/tree")
-    @RequiresPermissions("system:position:query")
-    public ApiResponse<List<SystemPositionListVO>> findTree () {
-        return ApiResponse.success(systemPositionBiz.findTree());
-    }
-
-    @ApiOperation("鏌ヨ宀椾綅鍒楄〃")
-    @PostMapping("/all")
-    @RequiresPermissions("system:position:query")
-    public ApiResponse<List<SystemPosition>> findList () {
-        SystemPosition systemPosition = new SystemPosition();
-        systemPosition.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemPositionService.findList(systemPosition));
-    }
-
-    @Trace(exclude = true)
-    @ApiOperation("鏌ヨ宀椾綅浜哄憳")
-    @PostMapping("/users")
-    @RequiresPermissions("system:position:queryUsers")
-    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
-        return ApiResponse.success(systemUserService.findPage(pageWrap));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemRoleController.java
deleted file mode 100644
index a81ad34..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemRoleBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.CreateRoleMenuDTO;
-import com.doumee.dao.system.dto.CreateRolePermissionDTO;
-import com.doumee.dao.system.dto.QuerySystemRoleDTO;
-import com.doumee.dao.system.model.SystemRole;
-import com.doumee.dao.system.vo.SystemRoleListVO;
-import com.doumee.service.system.SystemRoleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "绯荤粺瑙掕壊")
-@RestController
-@RequestMapping("/system/role")
-public class SystemRoleController extends BaseController {
-
-    @Autowired
-    private SystemRoleService systemRoleService;
-
-    @Autowired
-    private SystemRoleBiz systemRoleBiz;
-
-    @PreventRepeat
-    @ApiOperation("閰嶇疆瑙掕壊鑿滃崟")
-    @PostMapping("/createRoleMenu")
-    @RequiresPermissions("system:role:createRoleMenu")
-    public ApiResponse createRoleMenu (@Validated @RequestBody CreateRoleMenuDTO dto) {
-        systemRoleBiz.createRoleMenu(dto);
-        return ApiResponse.success(null);
-    }
-
-    @PreventRepeat
-    @ApiOperation("閰嶇疆瑙掕壊鏉冮檺")
-    @PostMapping("/createRolePermission")
-    @RequiresPermissions("system:role:createRolePermission")
-    public ApiResponse createRolePermission (@Validated @RequestBody CreateRolePermissionDTO dto) {
-        systemRoleBiz.createRolePermission(dto);
-        return ApiResponse.success(null);
-    }
-
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:role:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
-        return ApiResponse.success(systemRoleBiz.create(systemRole));
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:role:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemRoleBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:role:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemRoleBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:role:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) {
-        systemRoleBiz.updateById(systemRole);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:role:query")
-    public ApiResponse<PageData<SystemRoleListVO>> findPage (@RequestBody PageWrap<QuerySystemRoleDTO> pageWrap) {
-        return ApiResponse.success(systemRoleService.findPage(pageWrap));
-    }
-
-    @ApiOperation("鏌ヨ鎵�鏈�")
-    @GetMapping("/all")
-    @RequiresPermissions("system:role:query")
-    public ApiResponse<List<SystemRole>> findAll () {
-        SystemRole systemRole = new SystemRole();
-        systemRole.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemRoleService.findList(systemRole));
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemTraceLogController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemTraceLogController.java
deleted file mode 100644
index e4745dc..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemTraceLogController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.QuerySystemTraceLogDTO;
-import com.doumee.dao.system.model.SystemTraceLog;
-import com.doumee.service.system.SystemTraceLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "璺熻釜鏃ュ織")
-@RestController
-@RequestMapping("/system/traceLog")
-public class SystemTraceLogController extends BaseController {
-
-    @Autowired
-    private SystemTraceLogService systemTraceLogService;
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:traceLog:query")
-    public ApiResponse findPage (@RequestBody PageWrap<QuerySystemTraceLogDTO> pageWrap) {
-        return ApiResponse.success(systemTraceLogService.findPage(pageWrap));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @RequiresPermissions("system:traceLog:query")
-    public void exportExcel (@RequestBody PageWrap<QuerySystemTraceLogDTO> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SystemTraceLog.class).export(systemTraceLogService.findPage(pageWrap).getRecords(), "鎿嶄綔鏃ュ織", response);
-    }
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemUserController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemUserController.java
deleted file mode 100644
index a2cca7e..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemUserController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.doumee.api.system;
-
-import com.doumee.api.BaseController;
-import com.doumee.biz.system.SystemUserBiz;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
-import com.doumee.dao.system.model.SystemUser;
-import com.doumee.dao.system.vo.SystemUserListVO;
-import com.doumee.service.system.SystemUserService;
-import io.swagger.annotations.*;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Api(tags = "鐢ㄦ埛")
-@RestController
-@RequestMapping("/system/user")
-public class SystemUserController extends BaseController {
-
-    @Autowired
-    private SystemUserService systemUserService;
-
-    @Autowired
-    private SystemUserBiz systemUserBiz;
-
-    @PreventRepeat
-    @ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
-    @PostMapping("/createUserRole")
-    @RequiresPermissions("system:user:createUserRole")
-    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
-        systemUserBiz.createUserRole(dto);
-        return ApiResponse.success(null);
-    }
-
-    @Trace(withRequestParameters = false)
-    @PreventRepeat
-    @ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
-    @PostMapping("/resetPwd")
-    @RequiresPermissions("system:user:resetPwd")
-    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
-        dto.setOperaUserId(this.getLoginUser().getId());
-        systemUserBiz.resetPwd(dto);
-        return ApiResponse.success(null);
-    }
-
-    @Trace(withRequestParameters = false)
-    @PreventRepeat
-    @ApiOperation("鏂板缓")
-    @PostMapping("/create")
-    @RequiresPermissions("system:user:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setCreateUser(this.getLoginUser().getId());
-        systemUserBiz.create(systemUser);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
-    @RequiresPermissions("system:user:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
-        systemUserBiz.deleteById(id);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
-    @RequiresPermissions("system:user:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemUserBiz.deleteByIdInBatch(idList);
-        return ApiResponse.success(null);
-    }
-
-    @Trace(withRequestParameters = false)
-    @ApiOperation("淇敼")
-    @PostMapping("/updateById")
-    @RequiresPermissions("system:user:update")
-    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setUpdateUser(this.getLoginUser().getId());
-        systemUserBiz.updateById(systemUser);
-        return ApiResponse.success(null);
-    }
-
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @RequiresPermissions("system:user:query")
-    public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
-        return ApiResponse.success(systemUserService.findPage(pageWrap));
-    }
-
-
-
-
-
-    @ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
-    @PostMapping("/findAllList")
-    @RequiresPermissions("system:user:query")
-    public ApiResponse<List<SystemUser>> findAllList (@RequestBody SystemUser pageWrap) {
-        return ApiResponse.success(systemUserService.findAllList(pageWrap));
-    }
-
-
-    @ApiOperation("鏍规嵁ID鏌ヨ")
-    @GetMapping("/{id}")
-    @RequiresPermissions("system:user:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(systemUserService.findById(id));
-    }
-
-    @ApiOperation("鐢ㄦ埛瀵煎叆")
-    @PostMapping("/importSystemUserBatch")
-    @RequiresPermissions("system:user:query")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
-    })
-    public ApiResponse importSystemUserBatch(@ApiParam(value = "file") MultipartFile file){
-        return ApiResponse.success(systemUserBiz.importSystemUserBatch(file));
-    }
-}
diff --git a/server/system_gateway/src/main/resources/application.yml b/server/system_gateway/src/main/resources/application.yml
index dc68829..d3f483c 100644
--- a/server/system_gateway/src/main/resources/application.yml
+++ b/server/system_gateway/src/main/resources/application.yml
@@ -71,7 +71,7 @@
   jwt:
     enabled: true   #鏄惁寮�鍚疛WT鐧诲綍璁よ瘉鍔熻兘
     secret: fjkfaf;afa  # JWT绉侀挜锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
-    expiration: 3600000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+    expiration: 36000000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
     header: JWTHeaderName #HTTP璇锋眰鐨凥eader鍚嶇О锛岃Header浣滀负鍙傛暟浼犻�扟WT浠ょ墝
     userParamName: username  #鐢ㄦ埛鐧诲綍璁よ瘉鐢ㄦ埛鍚嶅弬鏁板悕绉�
     pwdParamName: password  #鐢ㄦ埛鐧诲綍璁よ瘉瀵嗙爜鍙傛暟鍚嶇О
diff --git a/server/system_service/src/main/java/com/doumee/api/BaseController.java b/server/system_service/src/main/java/com/doumee/api/BaseController.java
index b19a5e9..e431c04 100644
--- a/server/system_service/src/main/java/com/doumee/api/BaseController.java
+++ b/server/system_service/src/main/java/com/doumee/api/BaseController.java
@@ -32,17 +32,10 @@
      * @author Eva.Caesar Liu
      * @date 2023/03/21 14:49
      */
-    protected LoginUserInfo getLoginUser () {
-        return (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
-    }
-    /**
-     * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
-     * @author Eva.Caesar Liu
-     * @date 2023/03/21 14:49
-     */
     protected LoginUserInfo getLoginUser (String token) {
         if (token == null || token.isEmpty()) {
-            throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
+               return (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+//            throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
         }
         String userinfo =(String) stringRedisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY + token);
         if (StringUtils.isBlank(userinfo)) {
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
index b1c5efd..866141a 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java
@@ -73,7 +73,7 @@
     @PostMapping("/updateById")
     @RequiresPermissions("system:datapermission:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission) {
-        systemDataPermission.setCreateUser(this.getLoginUser(token).getId());
+        systemDataPermission.setUpdateUser(this.getLoginUser(token).getId());
         systemDataPermissionBiz.update(systemDataPermission);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
index fc3363a..5f9f971 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
@@ -46,8 +46,8 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:department:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
+        systemDepartment.setCreateUser(getLoginUser(token).getId());
+        systemDepartment.setUpdateUser(getLoginUser(token).getId());
         return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
     }
 
@@ -77,8 +77,8 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:department:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
+        systemDepartment.setCreateUser(getLoginUser(token).getId());
+        systemDepartment.setUpdateUser(getLoginUser(token).getId());
         systemDepartmentBiz.updateById(systemDepartment);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
index 7363da8..7d0dcbc 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
@@ -42,6 +42,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:dict:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDict systemDict) {
+        systemDict.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDictBiz.create(systemDict));
     }
 
@@ -70,6 +71,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:dict:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDict systemDict) {
+        systemDict.setUpdateUser(this.getLoginUser(token).getId());
         systemDictBiz.updateById(systemDict);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
index 9c1b455..c50f6cd 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java
@@ -44,6 +44,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:dict:update")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
+        systemDictData.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDictDataBiz.create(systemDictData));
     }
 
@@ -72,6 +73,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:dict:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
+        systemDictData.setUpdateUser(this.getLoginUser(token).getId());
         systemDictDataBiz.updateById(systemDictData);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
index 39fc0cf..d274b92 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
@@ -36,6 +36,7 @@
     @PostMapping("/updateSort")
     @CloudRequiredPermission("system:menu:sort")
     public ApiResponse updateSort (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody UpdateSystemMenuSortDTO dto) {
+        dto.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateSort(dto);
         return ApiResponse.success(null);
     }
@@ -58,6 +59,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:menu:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemMenuBiz.create(systemMenu));
     }
 
@@ -86,6 +88,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:menu:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }
@@ -94,6 +97,7 @@
     @PostMapping("/updateStatus")
     @CloudRequiredPermission("system:menu:update")
     public ApiResponse updateStatus(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
index 833d79d..c99d039 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
@@ -42,6 +42,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:permission:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
+        systemPermission.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemPermissionBiz.create(systemPermission));
     }
 
@@ -70,6 +71,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:permission:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
+        systemPermission.setUpdateUser(this.getLoginUser(token).getId());
         systemPermissionBiz.updateById(systemPermission);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
index ea2c728..a60d8ba 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java
@@ -48,6 +48,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:position:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) {
+        systemPosition.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemPositionBiz.create(systemPosition));
     }
 
@@ -76,6 +77,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:position:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) {
+        systemPosition.setUpdateUser(this.getLoginUser(token).getId());
         systemPositionBiz.updateById(systemPosition);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
index ac5d5f0..fa6c59d 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java
@@ -43,6 +43,7 @@
     @PostMapping("/createRoleMenu")
     @CloudRequiredPermission("system:role:createRoleMenu")
     public ApiResponse createRoleMenu (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody CreateRoleMenuDTO dto) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemRoleBiz.createRoleMenu(dto);
         return ApiResponse.success(null);
     }
@@ -52,6 +53,7 @@
     @PostMapping("/createRolePermission")
     @CloudRequiredPermission("system:role:createRolePermission")
     public ApiResponse createRolePermission (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateRolePermissionDTO dto) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemRoleBiz.createRolePermission(dto);
         return ApiResponse.success(null);
     }
@@ -61,6 +63,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("system:role:create")
     public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+        systemRole.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemRoleBiz.create(systemRole));
     }
 
@@ -89,6 +92,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:role:update")
     public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) {
+        systemRole.setUpdateUser(this.getLoginUser(token).getId());
         systemRoleBiz.updateById(systemRole);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index a35d13a..63b6a70 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -45,7 +45,8 @@
     @ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
     @PostMapping("/createUserRole")
     @CloudRequiredPermission("system:user:createUserRole")
-    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+    public ApiResponse createUserRole (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateUserRoleDTO dto) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.createUserRole(dto);
         return ApiResponse.success(null);
     }
@@ -55,8 +56,8 @@
     @ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
     @PostMapping("/resetPwd")
     @CloudRequiredPermission("system:user:resetPwd")
-    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
-        dto.setOperaUserId(this.getLoginUser().getId());
+    public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
+        dto.setOperaUserId(this.getLoginUser(token).getId());
         systemUserBiz.resetPwd(dto);
         return ApiResponse.success(null);
     }
@@ -66,8 +67,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("system:user:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setCreateUser(this.getLoginUser().getId());
+    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
+        systemUser.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.create(systemUser);
         return ApiResponse.success(null);
     }
@@ -97,8 +98,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:user:update")
-    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setUpdateUser(this.getLoginUser().getId());
+    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody CreateSystemUserDTO systemUser) {
+        systemUser.setUpdateUser(this.getLoginUser(token).getId());
         systemUserBiz.updateById(systemUser);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
index 7572835..9c397cb 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java
@@ -57,7 +57,7 @@
     @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
     @PostMapping("/updatePwd")
     public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) {
-        dto.setUserId(this.getLoginUser().getId());
+        dto.setUserId(this.getLoginUser(null).getId());
         systemUserBiz.updatePwd(dto);
         return ApiResponse.success(null);
     }
@@ -65,6 +65,6 @@
     @ApiOperation("鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
     @GetMapping("/getUserInfo")
     public ApiResponse<LoginUserInfo> getUserInfo () {
-        return ApiResponse.success(this.getLoginUser());
+        return ApiResponse.success(this.getLoginUser(null));
     }
 }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
index 97f4ce8..3546357 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
@@ -9,6 +9,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.model.SystemDataPermission;
 import com.doumee.dao.system.vo.SystemDataPermissionListVO;
 import com.doumee.service.system.SystemDataPermissionService;
@@ -43,7 +44,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:datapermission:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDataPermission systemDataPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDataPermission.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDataPermissionBiz.create(systemDataPermission));
     }
 
@@ -71,7 +73,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:datapermission:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDataPermission systemDataPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDataPermission.setUpdateUser(this.getLoginUser(token).getId());
         systemDataPermissionBiz.update(systemDataPermission);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
index f013ef7..7d341f0 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
@@ -8,6 +8,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemUserDTO;
 import com.doumee.dao.system.model.SystemDepartment;
 import com.doumee.dao.system.vo.SystemDepartmentListVO;
@@ -44,9 +45,9 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:department:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDepartment.setCreateUser(this.getLoginUser(token).getId());
+        systemDepartment.setUpdateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
     }
 
@@ -75,9 +76,9 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:department:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
-        systemDepartment.setCreateUser(getLoginUser().getId());
-        systemDepartment.setUpdateUser(getLoginUser().getId());
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDepartment.setCreateUser(this.getLoginUser(token).getId());
+        systemDepartment.setUpdateUser(this.getLoginUser(token).getId());
         systemDepartmentBiz.updateById(systemDepartment);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
index 71a297a..32345b7 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java
@@ -7,6 +7,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemDictDTO;
 import com.doumee.dao.system.model.SystemDict;
 import com.doumee.dao.system.vo.SystemDictListVO;
@@ -40,7 +41,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:dict:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDict systemDict) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDict systemDict, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDict.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDictBiz.create(systemDict));
     }
 
@@ -68,7 +70,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:dict:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDict systemDict) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDict systemDict, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDict.setUpdateUser(this.getLoginUser(token).getId());
         systemDictBiz.updateById(systemDict);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
index 92793f0..93f9e9d 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java
@@ -7,6 +7,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemDictDataDTO;
 import com.doumee.dao.system.model.SystemDictData;
 import com.doumee.dao.system.vo.SystemDictDataListVO;
@@ -44,7 +45,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:dict:update")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDictData systemDictData, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDictData.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemDictDataBiz.create(systemDictData));
     }
 
@@ -72,7 +74,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:dict:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDictData systemDictData, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemDictData.setUpdateUser(this.getLoginUser(token).getId());
         systemDictDataBiz.updateById(systemDictData);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
index 9b4514c..569b7c6 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -5,6 +5,7 @@
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.constants.OperaType;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
 import com.doumee.dao.system.model.SystemMenu;
 import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -34,7 +35,8 @@
     @ApiOperation("鑿滃崟鎺掑簭")
     @PostMapping("/updateSort")
     @RequiresPermissions("system:menu:sort")
-    public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto) {
+    public ApiResponse updateSort (@Validated @RequestBody UpdateSystemMenuSortDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        dto.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateSort(dto);
         return ApiResponse.success(null);
     }
@@ -42,7 +44,7 @@
     @ApiOperation("鏌ヨ鑿滃崟鏍�")
     @GetMapping("/treeNodes")
     public ApiResponse<List<SystemMenuNodeVO>> getTreeMenu () {
-        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser().getId()));
+        return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser(null).getId()));
     }
 
     @ApiOperation("鏌ヨ鍒楄〃鏍�")
@@ -56,7 +58,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:menu:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemMenu.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemMenuBiz.create(systemMenu));
     }
 
@@ -84,7 +87,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:menu:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }
@@ -92,7 +96,8 @@
     @ApiOperation("淇敼鑿滃崟鐘舵��")
     @PostMapping("/updateStatus")
     @RequiresPermissions("system:menu:update")
-    public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu) {
+    public ApiResponse updateStatus(@Validated(OperaType.UpdateStatus.class) @RequestBody SystemMenu systemMenu, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemMenu.setUpdateUser(this.getLoginUser(token).getId());
         systemMenuBiz.updateById(systemMenu);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 9720ebf..c345e44 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -7,6 +7,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
 import com.doumee.dao.system.model.SystemPermission;
 import com.doumee.dao.system.vo.SystemPermissionListVO;
@@ -40,7 +41,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:permission:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
+    public ApiResponse create(@Validated(OperaType.Create.class)@RequestBody SystemPermission systemPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+       systemPermission.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemPermissionBiz.create(systemPermission));
     }
 
@@ -68,7 +70,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:permission:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemPermission.setUpdateUser(this.getLoginUser(token).getId());
         systemPermissionBiz.updateById(systemPermission);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
index c73ada3..f0af8bf 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java
@@ -8,6 +8,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemUserDTO;
 import com.doumee.dao.system.model.SystemPosition;
 import com.doumee.dao.system.vo.SystemPositionListVO;
@@ -47,7 +48,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:position:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPosition systemPosition, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemPosition.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemPositionBiz.create(systemPosition));
     }
 
@@ -75,7 +77,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:position:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPosition systemPosition, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemPosition.setUpdateUser(this.getLoginUser(token).getId());
         systemPositionBiz.updateById(systemPosition);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
index 7b0e613..3b71d00 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -7,6 +7,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.CreateRoleMenuDTO;
 import com.doumee.dao.system.dto.CreateRolePermissionDTO;
 import com.doumee.dao.system.dto.QuerySystemRoleDTO;
@@ -42,7 +43,8 @@
     @ApiOperation("閰嶇疆瑙掕壊鑿滃崟")
     @PostMapping("/createRoleMenu")
     @RequiresPermissions("system:role:createRoleMenu")
-    public ApiResponse createRoleMenu (@Validated @RequestBody CreateRoleMenuDTO dto) {
+    public ApiResponse createRoleMenu (@Validated @RequestBody CreateRoleMenuDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemRoleBiz.createRoleMenu(dto);
         return ApiResponse.success(null);
     }
@@ -51,7 +53,8 @@
     @ApiOperation("閰嶇疆瑙掕壊鏉冮檺")
     @PostMapping("/createRolePermission")
     @RequiresPermissions("system:role:createRolePermission")
-    public ApiResponse createRolePermission (@Validated @RequestBody CreateRolePermissionDTO dto) {
+    public ApiResponse createRolePermission (@Validated @RequestBody CreateRolePermissionDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemRoleBiz.createRolePermission(dto);
         return ApiResponse.success(null);
     }
@@ -60,7 +63,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:role:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemRole.setCreateUser(this.getLoginUser(token).getId());
         return ApiResponse.success(systemRoleBiz.create(systemRole));
     }
 
@@ -88,7 +92,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:role:update")
-    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole) {
+    public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemRole systemRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemRole.setUpdateUser(this.getLoginUser(token).getId());
         systemRoleBiz.updateById(systemRole);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
index 51550b6..e7db500 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -8,6 +8,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.CreateSystemUserDTO;
 import com.doumee.dao.system.dto.CreateUserRoleDTO;
 import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -45,7 +46,8 @@
     @ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
     @PostMapping("/createUserRole")
     @RequiresPermissions("system:user:createUserRole")
-    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        dto.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.createUserRole(dto);
         return ApiResponse.success(null);
     }
@@ -55,8 +57,8 @@
     @ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
     @PostMapping("/resetPwd")
     @RequiresPermissions("system:user:resetPwd")
-    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
-        dto.setOperaUserId(this.getLoginUser().getId());
+    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        dto.setOperaUserId(this.getLoginUser(token).getId());
         systemUserBiz.resetPwd(dto);
         return ApiResponse.success(null);
     }
@@ -66,8 +68,8 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:user:create")
-    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setCreateUser(this.getLoginUser().getId());
+    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemUser.setCreateUser(this.getLoginUser(token).getId());
         systemUserBiz.create(systemUser);
         return ApiResponse.success(null);
     }
@@ -97,8 +99,8 @@
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("system:user:update")
-    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
-        systemUser.setUpdateUser(this.getLoginUser().getId());
+    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        systemUser.setUpdateUser(this.getLoginUser(token).getId());
         systemUserBiz.updateById(systemUser);
         return ApiResponse.success(null);
     }
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index e6d6a63..2b5f6e2 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -86,6 +86,7 @@
         }
         for (int i = 0; i < menuPool.size(); i++) {
             menuPool.get(i).setSort(i);
+            menuPool.get(i).setUpdateUser(dto.getUpdateUser());
         }
         // 淇敼
         systemMenuService.updateByIdInBatch(menuPool);
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
index 480e738..d44d643 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java
@@ -91,6 +91,7 @@
             SystemRolePermission newRolePermission = new SystemRolePermission();
             newRolePermission.setRoleId(dto.getRoleId());
             newRolePermission.setPermissionId(permissionId);
+            newRolePermission.setCreateUser(dto.getCreateUser());
             systemRolePermissionService.create(newRolePermission);
         }
     }
@@ -107,6 +108,7 @@
             SystemRoleMenu newRoleMenu = new SystemRoleMenu();
             newRoleMenu.setRoleId(dto.getRoleId());
             newRoleMenu.setMenuId(menuId);
+            newRoleMenu.setCreateUser(dto.getCreateUser());
             systemRoleMenuService.create(newRoleMenu);
         }
     }
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 980f2c7..5b6a153 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -106,6 +106,7 @@
         // 淇敼瀵嗙爜
         SystemUser updateUserDto = new SystemUser();
         updateUserDto.setId(dto.getId());
+        updateUserDto.setUpdateUser(dto.getOperaUserId());
         updateUserDto.setPassword(Utils.Secure.encryptPassword(dto.getPassword(), systemUser.getSalt()));
         systemUserService.updateById(updateUserDto);
     }
@@ -240,6 +241,7 @@
             SystemUserRole newUserRole = new SystemUserRole();
             newUserRole.setUserId(dto.getUserId());
             newUserRole.setRoleId(roleId);
+            newUserRole.setCreateUser(dto.getCreateUser());
             systemUserRoleService.create(newUserRole);
         }
     }
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java
index f4aad8b..cc2c1ed 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java
@@ -19,6 +19,8 @@
     @ApiModelProperty(value = "鑿滃崟ID")
     @NotNull(message = "鑿滃崟ID涓嶈兘涓虹┖")
     private Integer id;
+    @ApiModelProperty(value = "鐢ㄦ埛缂栫爜" ,hidden = true)
+    private Integer updateUser;
 
     @ApiModelProperty(value = "鎺掑簭鏂瑰悜锛宼op鍚戜笂锛宐ottom鍚戜笅")
     @NotBlank(message = "鎺掑簭鏂瑰悜涓嶈兘涓虹┖")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
index 0a51540..313536b 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
@@ -19,7 +19,7 @@
  */
 @Data
 @ApiModel("绯荤粺鏉冮檺")
-public class SystemPermission implements Serializable {
+public class SystemPermission implements Serializable  {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index c221721..8315ae3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -66,7 +66,7 @@
     @GetMapping("/delete/{id}")
     @RequiresPermissions("business:company:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
-        companyService.deleteById(id,this.getLoginUser());
+        companyService.deleteById(id,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -79,7 +79,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        companyService.deleteByIdInBatch(idList,this.getLoginUser());
+        companyService.deleteByIdInBatch(idList,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
index 3631210..5ef9533 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java
@@ -71,7 +71,7 @@
     @PostMapping("/batchLoss")
     @RequiresPermissions("business:membercard:update")
     public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser());
+        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -79,7 +79,7 @@
     @PostMapping("/batchUnLoss")
     @RequiresPermissions("business:membercard:update")
     public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser());
+        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(null));
         return ApiResponse.success(null);
     }
 
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
index 148ac82..1eb747a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java
@@ -106,14 +106,14 @@
             @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true),
     })
     @CloudRequiredPermission("business:company:query")
-    public ApiResponse<List<Company>> tree (@RequestParam Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+    public ApiResponse<List<Company>> tree (@RequestParam(required=false) Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(companyService.companyTree(type));
     }
 
 
     @ApiOperation("鎺掑簭")
     @PostMapping("/updateSort")
-    @CloudRequiredPermission("business:company:query")
+    @CloudRequiredPermission("business:company:sort")
     public ApiResponse updateSort (@Validated @RequestBody UpdateCompanySortDTO dto,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         companyService.updateSort(dto);
         return ApiResponse.success(null);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
index 619f61c..b165a47 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -162,6 +162,9 @@
     @ApiModelProperty(value = "璐熻矗浜哄悕瀛�")
     @TableField(exist = false)
     private String headName;
+    @ApiModelProperty(value = "鎿嶄綔浜哄悕瀛�")
+    @TableField(exist = false)
+    private String editorName;
     @ApiModelProperty(value = "璐熻矗浜烘墜鏈哄彿")
     @TableField(exist = false)
     private String headPhone;
@@ -181,6 +184,9 @@
     @ApiModelProperty(value = "鑷缓閮ㄩ棬绾у埆璺緞", example = "1")
     @ExcelColumn(name="鑷缓閮ㄩ棬绾у埆璺緞")
     private String companyPath;
+    @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1")
+    @TableField(exist = false)
+    private String parentCompanyPath;
     @ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1")
     @ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞")
     private String erpCompanyPath;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 33ddd3a..1c46da2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -30,6 +30,7 @@
 import com.doumee.dao.business.model.Category;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.CompanyService;
 import com.doumee.dao.business.vo.CompanyTree;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -70,9 +71,11 @@
         if(StringUtils.isBlank(company.getName())){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
+        if(company.getType()==null || !(company.getType() ==0 || company.getType() ==1)){
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
+        }
         //鏌ヨ鍚嶇О涓嶈兘閲嶅
         if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
-//                .eq(Company::getType,Constants.ONE)
                 .eq(Company::getName,company.getName())
                 .eq(Company::getIsdeleted,Constants.ZERO)) >0){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~");
@@ -101,7 +104,9 @@
         company.setIsdeleted(Constants.ZERO);
         company.setHkStatus(Constants.ONE);
         company.setStatus(Constants.ZERO);
-        company.setHkDate(company.getHkDate());
+        company.setHkDate(company.getCreateDate());
+        company.setEditDate(company.getCreateDate());
+        company.setEditor(company.getCreator());
         company.setHkId(UUID.randomUUID().toString().replace("-",""));
         companyMapper.insert(company);
         //涓嬪彂娴峰悍瀹夐槻骞冲彴
@@ -250,9 +255,11 @@
         if(company.getId() == null|| StringUtils.isBlank(company.getName())){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
+        if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1)){
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
+        }
         //鏌ヨ鍚嶇О涓嶈兘閲嶅
         if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
-//                .eq(Company::getType,Constants.ONE)
                 .eq(Company::getName,company.getName())
                 .ne(Company::getId,company.getId())
                 .eq(Company::getIsdeleted,Constants.ZERO)) >0){
@@ -273,13 +280,19 @@
         company.setEditor(user.getId());
         company.setHkStatus(Constants.ONE);
         company.setHkDate(company.getHkDate());
-        company.setHkId(model.getHkId());
+        company.setHkId(StringUtils.defaultString(model.getHkId(),UUID.randomUUID().toString().replace("-","")));
+        company.setParentId(null);//涓嶆敮鎸佷慨鏀圭埗绾�
         companyMapper.updateById(company);
         //涓嬪彂娴峰悍瀹夐槻骞冲彴
-        if(StringUtils.isNotBlank(company.getHkId())
-                && Constants.equalsObject(Constants.ONE,model.getHkId())
-                && !editHkOrg(company)){
-            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+        if(StringUtils.isNotBlank(model.getHkId())
+                && Constants.equalsObject(Constants.ONE,model.getHkStatus())){
+             if(editHkOrg(company)){
+                 throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+             }
+        }else{//濡傛灉娌℃湁涓嬪彂杩囷紝鐩存帴鏂板缓瀹夐槻骞冲彴缁勭粐
+            if(addHkOrg(company)){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
+            }
         }
 
     }
@@ -418,17 +431,13 @@
             queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
         }
         queryWrapper.orderByDesc(Company::getCreateDate);
-        queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId);
+        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
         /*        .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
       /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
         queryWrapper.selectAll(Company.class)
-                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum")
-                /*.select("c.name as parentName");*/
-                  .selectAs(Category::getName,Company::getCategoryName);
-                   /*   .selectAs(Member::getName,Company::getHeadName)
-                    .selectAs(Member::getPhone,Company::getHeadPhone)
-                    .select("count(t1.id) as countNum");*/
-//        queryWrapper.eq(Company::getType,Constants.ZERO);
+                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
+        queryWrapper.select("t1.name",Company::getParentName);
+        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
         queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
@@ -510,7 +519,6 @@
         QueryWrapper<Company> wrapper = new QueryWrapper<>();
         wrapper.lambda()
                 .eq(Company::getIsdeleted,Constants.ZERO)
-                .eq(Company::getType,Constants.ZERO)
                 .eq(Company::getName,company.getName());
         List<Company> companies = companyMapper.selectList(wrapper);
         if (CollectionUtils.isEmpty(companies)){
@@ -532,11 +540,16 @@
     public List<Company> companyTree(Integer type) {
         MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(Company.class);
+        queryWrapper.selectAs(SystemUser::getRealname,Company::getEditorName);
         queryWrapper.selectAs(Member::getName,Company::getHeadName);
         queryWrapper.selectAs(Member::getPhone,Company::getHeadPhone);
+        queryWrapper.select("t1.name",Company::getParentName);
+        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
         queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
+        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
         queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
-        queryWrapper.eq(Company::getType,type);
+        queryWrapper.eq(type!=null,Company::getType,type);
         List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
         //閰嶇疆缁勫憳浜哄憳绫诲瀷鏉ユ簮鏂瑰紡 0鑷缓 1ERP
         CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin());

--
Gitblit v1.9.3