From b471c4d9a01438af23516b622eb4381c15a45073 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 14:51:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java | 4 ++++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1 +
h5/utils/request.js | 2 +-
server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java | 4 ++--
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 3 +++
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/h5/utils/request.js b/h5/utils/request.js
index c0e9ba0..1f27e12 100644
--- a/h5/utils/request.js
+++ b/h5/utils/request.js
@@ -16,7 +16,7 @@
// http://127.0.0.1/interface/ http://192.168.0.15:10024/ preselect_web_interface
// https://dmtest.ahapp.net/preselect_web_interface/${url} http://127.0.0.1:10022/ http://192.168.0.35:10024/
uni.request({
- url: `http://192.168.0.35:10024/${url}`,
+ url: `http://192.168.0.15:10024/${url}`,
method,
data,
header: {
diff --git a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
index fd01a68..edd851c 100644
--- a/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/BaseCategoryController.java
@@ -35,7 +35,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
-// @RequiresPermissions("business:basecategory:create")
+ @RequiresPermissions("business:basecategory:create")
public ApiResponse create(@RequestBody BaseCategoryRequest baseCategory) {
return ApiResponse.success(baseCategoryService.create(baseCategory));
}
@@ -105,7 +105,7 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
-// @RequiresPermissions("business:basecategory:query")
+ @RequiresPermissions("business:basecategory:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(baseCategoryService.findById(id));
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 4d777fa..61b8652 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -53,6 +53,7 @@
public static final String DEFAULT_PASSWORD = "DEFAULT_PASSWORD";
public static final String BRAND_IMG = "BRAND_IMG";
public static final String PLATFORM = "PLATFORM";
+ public static final String ZHUBO_ROOM_URL = "ZHUBO_ROOM_URL";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
diff --git a/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java b/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
index 50426f0..dc7946d 100644
--- a/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
@@ -35,4 +35,8 @@
@ApiModelProperty(value = "浼佷笟鍚嶇О")
private String companyName;
+
+ @ApiModelProperty(value = "涓绘挱绔湴鍧�")
+ private String zhuboRoomUrl;
+
}
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 8ad34f5..83c8fb6 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -135,11 +135,14 @@
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
+ String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.ZHUBO_ROOM_URL).getCode();
+
for (SystemUserListVO user : userList) {
// 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃
user.setRoles(systemRoleService.findByUserId(user.getId()));
// 鏌ヨ鐢ㄦ埛宀椾綅鍒楄〃
// user.setPositions(systemPositionService.findByUserId(user.getId()));
+ user.setZhuboRoomUrl(zhuboRoomUrl);
}
return PageData.from(new PageInfo<>(userList));
}
--
Gitblit v1.9.3