From 0b342b923cbec6ca293a98dd192b40c0fd2c12db Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Mar 2022 11:40:16 +0800
Subject: [PATCH] fix some problem and data premission
---
src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
index 2e8600d..405d950 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
@@ -1,17 +1,17 @@
package cc.mrbird.febs.dapp.controller;
import cc.mrbird.febs.common.annotation.ControllerEndpoint;
+import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.service.DappUserService;
import cc.mrbird.febs.system.entity.User;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author wzy
@@ -22,9 +22,19 @@
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "dappUser")
-public class DappUserController {
+public class DappUserController extends BaseController {
private final DappUserService dappUserService;
+
+ @RequiresPermissions("admin:view")
+ @GetMapping(value = "/list")
+ public FebsResponse list(User user, QueryRequest request) {
+ User currentUser = FebsUtil.getCurrentUser();
+ if (currentUser.getDeptId() == null) {
+ user.setCreateBy(currentUser.getUserId());
+ }
+ return new FebsResponse().success().data(getDataTable(dappUserService.findInPage(user, request)));
+ }
@RequiresPermissions("admin:add")
@PostMapping(value = "/add")
@@ -42,15 +52,10 @@
}
@RequiresPermissions("admin:delete")
- @PostMapping(value = "/delete")
+ @PostMapping(value = "/delete/{ids}")
@ControllerEndpoint(operation = "删除用户", exceptionMessage = "删除用户失败")
- public FebsResponse delete(User user) {
- return null;
- }
-
- @PostMapping(value = "/resetPwd/{id}")
- @ControllerEndpoint(operation = "重置密码", exceptionMessage = "重置密码失败")
- public FebsResponse resetPwd(@PathVariable("id") Long id) {
- return null;
+ public FebsResponse delete(@PathVariable("ids") String ids) {
+ dappUserService.delete(ids);
+ return new FebsResponse().success();
}
}
--
Gitblit v1.9.1