From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
index 08729b4..e7797f6 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -1,9 +1,18 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.PersonDto;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.PowerMapper;
+import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Company;
+import com.yuanchu.mom.pojo.Person;
+import com.yuanchu.mom.pojo.Power;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.util.HeaderToken;
import com.yuanchu.mom.vo.Result;
@@ -12,6 +21,7 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -24,11 +34,40 @@
private UserService userService;
+ UserMapper userMapper;
+
+ PowerMapper powerMapper;
+
+ private GetLook getLook;
+
@ValueClassify("鐢ㄦ埛绠＄悊")
- @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯")
+ @PostMapping("/getSampleUser")
+ @ApiOperation(value = "鏌ョ湅鎸囧畾閮ㄩ棬鐨勪汉浜嬬郴缁熺粍缁囨灦鏋�")
+ public Result<?> getSampleUser(){
+ return Result.success();
+ }
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
@GetMapping(value = "/selectCompaniesList")
public Result<List<Company>> selectCompaniesList() {
- return Result.success(headerToken.companyUrl());
+ //鍒ゆ柇鏄惁鏈夌洿鎺ヨ幏鍙栫涓夋柟閮ㄩ棬鐨勬潈闄�
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ User user = userMapper.selectById(userId);
+ Integer roleId = user.getRoleId();
+ Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "getSampleUser"));
+ if (ObjectUtils.isNotEmpty(power)){
+ List<Company> companies = new ArrayList<>();
+ Company company = new Company();
+ if (ObjectUtils.isEmpty(user.getCompanyId())){
+ throw new ErrorException("璇ョ敤鎴锋病鏈夋墍灞炲崟浣�!");
+ }
+ company.setCompanyId(user.getCompanyId());
+ companies.add(company);
+ return Result.success(companies);
+ }else {
+ return Result.success(headerToken.companyUrl());
+ }
}
@ValueAuth
@@ -45,4 +84,12 @@
return Result.success(userService.addPersonUser(personDto));
}
+ @ValueAuth
+ @ApiOperation("閫氳繃鍛樺伐鍙疯幏鍙栧憳宸�")
+ @PostMapping(value = "/selectPersonUser")
+ public Result<?> selectPersonUser(String code) {
+ Person person = headerToken.selectPersonUser(code);
+ return Result.success(person);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3