From 7b36013a20c3113a2d66033371d289b8da678b29 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java
index 36c05a4..85a5e4d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/feign/UserClient.java
@@ -26,10 +26,7 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -68,6 +65,11 @@
public R<UserInfo> userInfo(String tenantId, String account, String userType) {
return R.data(service.userInfo(tenantId, account, UserEnum.of(userType)));
}
+ @Override
+ @GetMapping(USER_ALL)
+ public R<List<User>> selectAllUser() {
+ return R.data(service.selectAllUser());
+ }
@Override
@PostMapping(USER_AUTH_INFO)
@@ -99,4 +101,10 @@
return R.data(service.updateUser(user));
}
+ @Override
+ @PostMapping(UPDATE_USER_STRATEGY_STATUS)
+ public R<Boolean> updateStrategyStatus(@RequestParam List<Long> userIds) {
+ return R.data(service.updateByUseStrategyId(userIds));
+ }
+
}
--
Gitblit v1.9.3