From 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 18:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 2 +-
server/service/src/main/resources/banner.txt | 18 +++++++++---------
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 10 +++++++---
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 6 +++---
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 2db1ee9..bb93b7a 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -49,7 +49,7 @@
@PreventRepeat
@ApiOperation("浼佷笟鏂板缓鍟嗗搧")
@PostMapping("/companyCreate")
- @RequiresPermissions("business:goods:create")
+// @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
return ApiResponse.success(goodsService.companyCreate(goods));
}
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index 51522dd..b21c9a9 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -48,10 +48,10 @@
}
@ApiOperation("鏌ヨ鍒楄〃鏍�")
- @PostMapping("/treeList")
+ @PostMapping("/treeList/{type}")
@RequiresPermissions("system:menu:query")
- public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTreeByType(0));
+ public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
+ return ApiResponse.success(systemMenuBiz.findTreeByType(type));
}
@PreventRepeat
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 4e04375..4312e70 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -130,7 +130,7 @@
@Override
public Integer createPlat(GoodCreatePlatRequest param){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(Constants.equalsInteger(user.getType(), Constants.UserType.COMPANY.getKey())){
+ if(!Constants.equalsInteger(user.getType(), Constants.UserType.COMPANY.getKey())){
//闈炰紒涓氱敤鎴蜂笉鑳芥搷浣�
throw new BusinessException(ResponseStatus.NOT_ALLOWED);
}
@@ -143,7 +143,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Category category = categoryMapper.selectById(param.getCategoryId());
- if(category ==null ||Constants.equalsInteger(category.getIsdeleted(), Constants.ONE) ||Constants.equalsInteger(category.getCompanyId(), user.getCompanyId())){
+ if(category ==null ||Constants.equalsInteger(category.getIsdeleted(), Constants.ONE) ||!Constants.equalsInteger(category.getCompanyId(), user.getCompanyId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绫诲埆淇℃伅涓嶆纭紝璇峰埛鏂伴噸璇曪紒");
}
if(category.getPlatCateId() == null){
@@ -160,11 +160,14 @@
if(p.getGoodsId() == null || p.getPrice() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋纭�夋嫨骞冲彴鍟嗗搧骞堕厤缃叆鎵嬩环锛�");
}
+ if(ids == null){
+ ids = new ArrayList<>();
+ }
ids.add(p.getGoodsId());
}
}
goodsList = baseGoodsMapper.selectList(new QueryWrapper<>(bp).lambda().in((ids!=null && ids.size()>0),BaseGoods::getId,ids));
- if(Constants.equalsInteger(Constants.ONE, param.getType()) || goodsList==null || ids.size()!=goodsList.size()){
+ if(Constants.equalsInteger(Constants.ONE, param.getType()) &&( goodsList==null || ids.size()!=goodsList.size())){
// 濡傛灉閫夋嫨骞冲彴鍟嗗搧鍜屾煡璇㈢粨鏋滃涓嶄笂锛屾彁绀洪敊璇�
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋纭�夋嫨骞冲彴鍟嗗搧锛�");
}
@@ -219,6 +222,7 @@
goods.setStatus(Constants.ZERO);
goods.setCreateDate(new Date());
goods.setCreator(user.getId());
+ goods.setCompanyId(user.getCompanyId());
goods.setIsdeleted(Constants.ZERO);
//澶勭悊鎷奸煶闂
goods.setPinyin(PinYinUtil.getFullSpell(goods.getName()));
diff --git a/server/service/src/main/resources/banner.txt b/server/service/src/main/resources/banner.txt
index e1d9b57..daf2474 100644
--- a/server/service/src/main/resources/banner.txt
+++ b/server/service/src/main/resources/banner.txt
@@ -2,17 +2,17 @@
${AnsiColor.BLUE}
================================================================================
- 娆㈣繋浣跨敤浼婂▋妗嗘灦锛堝崟搴旂敤鐗堬級
+ 娆㈣繋浣跨敤璞嗙背妗嗘灦锛堝崟搴旂敤鐗堬級
Version :: 1.0
- 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅
- 鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻堚枅
- 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻堚枅鈻戔枒鈻堚枅
- 鈻戔枅鈻堚枅鈻堚枅鈻堚枅 鈻戔枒鈻堚枅 鈻堚枅 鈻堚枅 鈻戔枒鈻堚枅
- 鈻戔枅鈻堚枒鈻戔枒鈻� 鈻戔枒鈻堚枅 鈻堚枅 鈻堚枅鈻堚枅鈻堚枅鈻堚枅鈻堚枅
- 鈻戔枅鈻� 鈻戔枒鈻堚枅鈻堚枅 鈻戔枅鈻堚枒鈻戔枒鈻戔枒鈻戔枅鈻�
- 鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枅鈻�
- 鈻戔枒鈻戔枒鈻戔枒鈻戔枒 鈻戔枒 鈻戔枒 鈻戔枒
+ 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅
+ 鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻堚枅 鈻戔枅鈻堚枒鈻堚枅 鈻戔枅鈻堚枒鈻堚枅
+ 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅鈻戔枅鈻� 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枒鈻堚枅
+ 鈻戔枅鈻� 鈻堚枅 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
+ 鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻堚枒 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
+ 鈻戔枒鈻戔枒鈻戔枒鈻戔枒 鈻戔枒 鈻戔枒 鈻戔枒
鍚姩绔彛: ${server.port} 鍚姩鐜: ${project.env} 鏃ュ織绛夌骇: ${logback.level} 鍚敤Swagger: ${swagger.enabled}
--
Gitblit v1.9.3