From ec74f248ddac773a6024a243a37346bd2e9bb028 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 15 Oct 2020 23:46:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_agent
---
src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
index 57a68ed..74b18b8 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
@@ -2,9 +2,14 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
+import com.xcong.excoin.system.entity.User;
+import com.xcong.excoin.system.service.IUserService;
+import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -13,14 +18,16 @@
**/
@Controller("memberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "/agent")
+@RequiredArgsConstructor
public class ViewController {
+
+ private final IUserService userService;
@GetMapping("member")
@RequiresPermissions("amember:view")
public String member() {
return FebsUtil.view("modules/agent/member");
}
-
@GetMapping("agent")
@RequiresPermissions("agent:view")
@@ -33,4 +40,12 @@
public String agentAdd() {
return FebsUtil.view("modules/agent/agentAdd");
}
+
+ @GetMapping("agentEdit/{id}")
+ @RequiresPermissions("agent:edit")
+ public String agentEdit(@PathVariable Long id, Model model) {
+ User user = userService.findUserInfoById(id);
+ model.addAttribute("user", user);
+ return FebsUtil.view("modules/agent/agentEdit");
+ }
}
--
Gitblit v1.9.1