Skip to content

M
mall-server
Commit 62bf2968 authored by wangpeng's avatar wangpeng
Browse files
Options

Merge branch 'dev' into 'test'

取消审核权限放开 See merge request !44
parents 530b4953 133840c0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/controller/GoodsListController.java
View file @ 62bf2968
...@@ -127,7 +127,6 @@ public class GoodsListController { ...@@ -127,7 +127,6 @@ public class GoodsListController {
@PutMapping("/cancelCheck/{goodsId}") @PutMapping("/cancelCheck/{goodsId}")
public ResponseVO cancelCheck(@PathVariable String goodsId, @ApiParam(name = "adminId", value = "管理员id") public ResponseVO cancelCheck(@PathVariable String goodsId, @ApiParam(name = "adminId", value = "管理员id")
@RequestHeader String adminId) { @RequestHeader String adminId) {
adminService.adminAuthCheck(adminId, AdminTypeEnum.MERCHANT.getType());
String merchantId1 = adminService.getByAdminId(adminId).getMerchantId(); String merchantId1 = adminService.getByAdminId(adminId).getMerchantId();
String merchantId2 = spuService.getByGoodsId(goodsId).getMerchantId(); String merchantId2 = spuService.getByGoodsId(goodsId).getMerchantId();
if (!merchantId1.equals(merchantId2)) { if (!merchantId1.equals(merchantId2)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment