nidapeng
2024-05-06 8ea9463705d26f07a279bab974769a5ceed43415
最新版本
已删除14个文件
已修改36个文件
1555 ■■■■ 文件已修改
admin/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.test 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/company.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaInternalCompanyWindow.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/internalCompany.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/NoticesController.java 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemController.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDataPermissionController.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDepartmentController.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictController.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemLoginLogController.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMenuController.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMonitorController.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPermissionController.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPositionController.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemRoleController.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemTraceLogController.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemUserController.java 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/BaseController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemDataPermissionCloudController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictDataCloudController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemPositionCloudController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemRoleCloudController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemDataPermissionController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemDictController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemDictDataController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemPositionController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemRoleController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemRoleBizImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/CompanyCloudController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Company.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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'
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'
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) {
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
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
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/NoticesController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDataPermissionController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDepartmentController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemDictDataController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemLoginLogController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMenuController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemMonitorController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPermissionController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemPositionController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemRoleController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemTraceLogController.java
ÎļþÒÑɾ³ý
server/meeting/meeting_admin/src/main/java/com/doumee/api/system/SystemUserController.java
ÎļþÒÑɾ³ý
server/system_gateway/src/main/resources/application.yml
@@ -71,7 +71,7 @@
  jwt:
    enabled: true   #是否开启JWT登录认证功能
    secret: fjkfaf;afa  # JWT私钥,用于校验JWT令牌的合法性
    expiration: 3600000 #JWT令牌的有效期,用于校验JWT令牌的合法性
    expiration: 36000000 #JWT令牌的有效期,用于校验JWT令牌的合法性
    header: JWTHeaderName #HTTP请求的Header名称,该Header作为参数传递JWT令牌
    userParamName: username  #用户登录认证用户名参数名称
    pwdParamName: password  #用户登录认证密码参数名称
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)) {
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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));
    }
}
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
    }
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);
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);
        }
    }
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);
        }
    }
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 = "排序方向,top向上,bottom向下")
    @NotBlank(message = "排序方向不能为空")
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")
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);
    }
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);
    }
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);
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;
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());