From fec1341c1cb8e11cfbe3fa7dfabe447edb72b630 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 15:12:43 +0800
Subject: [PATCH] refactor(auth): 移除多个模块中的权限校验注解
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
index 7e8f217..d4ff5e4 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
@@ -36,9 +36,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -108,7 +106,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍟嗘満")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<CrmBusinessRespVO> getBusiness(@RequestParam("id") Long id) {
CrmBusinessDO business = businessService.getBusiness(id);
return success(buildBusinessDetail(business));
@@ -123,25 +120,45 @@
List<CrmBusinessProductDO> businessProducts = businessService.getBusinessProductListByBusinessId(businessVO.getId());
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(businessProducts, CrmBusinessProductDO::getItemId));
- Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
- convertSet(businessProducts, CrmBusinessProductDO::getItemUnitId));
+ // 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑鍗曚綅ID锛堜富鍗曚綅 + 杈呭崟浣�1 + 杈呭崟浣�2锛�
+ Set<Long> unitIds = new HashSet<>();
+ unitIds.addAll(convertSet(businessProducts, CrmBusinessProductDO::getItemUnitId));
+ itemMap.values().forEach(item -> {
+ if (item.getUnitMeasureId2() != null) {
+ unitIds.add(item.getUnitMeasureId2());
+ }
+ if (item.getUnitMeasureId3() != null) {
+ unitIds.add(item.getUnitMeasureId3());
+ }
+ });
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(unitIds);
businessVO.setProducts(BeanUtils.toBean(businessProducts, CrmBusinessRespVO.Product.class, businessProductVO ->
MapUtils.findAndThen(itemMap, businessProductVO.getItemId(),
item -> businessProductVO.setItemName(item.getName())
.setItemCode(item.getCode())
.setBarCode(item.getBarCode())
.setItemSpecification(item.getSpecification()))));
- // 濉厖鍗曚綅鍚嶇О
+ // 濉厖鍗曚綅鍚嶇О锛堜富鍗曚綅 + 杈呭崟浣�1 + 杈呭崟浣�2锛�
businessVO.getProducts().forEach(product -> {
MapUtils.findAndThen(unitMap, product.getItemUnitId(),
unit -> product.setItemUnitName(unit.getName()));
+ // 濉厖杈呭崟浣嶅悕绉�
+ MapUtils.findAndThen(itemMap, product.getItemId(), item -> {
+ if (item.getUnitMeasureId2() != null) {
+ MapUtils.findAndThen(unitMap, item.getUnitMeasureId2(),
+ unit -> product.setItemUnitName2(unit.getName()));
+ }
+ if (item.getUnitMeasureId3() != null) {
+ MapUtils.findAndThen(unitMap, item.getUnitMeasureId3(),
+ unit -> product.setItemUnitName3(unit.getName()));
+ }
+ });
});
return businessVO;
}
@GetMapping("/simple-all-list")
@Operation(summary = "鑾峰緱鍟嗘満鐨勭簿绠�鍒楄〃")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<List<CrmBusinessRespVO>> getSimpleContactList() {
CrmBusinessPageReqVO reqVO = new CrmBusinessPageReqVO();
reqVO.setPageSize(PAGE_SIZE_NONE); // 涓嶅垎椤�
@@ -154,7 +171,6 @@
@GetMapping("/list-by-customer")
@Operation(summary = "鑾峰緱鍟嗘満鍒楄〃锛屽熀浜庢寚瀹氬鎴�")
@Parameter(name = "customerId", description = "瀹㈡埛缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<List<CrmBusinessRespVO>> getBusinessListByCustomer(@RequestParam("customerId") Long customerId) {
List<CrmBusinessDO> list = businessService.getBusinessListByCustomerId(customerId);
return success(convertList(list, business -> // 鍙繑鍥� id銆乶ame 瀛楁
@@ -165,7 +181,6 @@
@GetMapping("/list-by-contact")
@Operation(summary = "鑾峰緱鍟嗘満鍒楄〃锛屽熀浜庢寚瀹氳仈绯讳汉")
@Parameter(name = "contactId", description = "鑱旂郴浜虹紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<List<CrmBusinessRespVO>> getBusinessListByContact(@RequestParam("contactId") Long contactId) {
List<CrmBusinessDO> list = businessService.getBusinessListByContact(contactId);
return success(buildBusinessDetailList(list));
@@ -173,7 +188,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍟嗘満鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<PageResult<CrmBusinessRespVO>> getBusinessPage(@Valid CrmBusinessPageReqVO pageVO) {
PageResult<CrmBusinessDO> pageResult = businessService.getBusinessPage(pageVO, getLoginUserId());
return success(new PageResult<>(buildBusinessDetailList(pageResult.getList()), pageResult.getTotal()));
@@ -191,7 +205,6 @@
@GetMapping("/page-by-contact")
@Operation(summary = "鑾峰緱鑱旂郴浜虹殑鍟嗘満鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
public CommonResult<PageResult<CrmBusinessRespVO>> getBusinessContactPage(@Valid CrmBusinessPageReqVO pageReqVO) {
PageResult<CrmBusinessDO> pageResult = businessService.getBusinessPageByContact(pageReqVO);
return success(new PageResult<>(buildBusinessDetailList(pageResult.getList()), pageResult.getTotal()));
--
Gitblit v1.9.3