From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/controller/SysUserExtendController.java | 42 +++++++-----------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/SysUserExtendController.java b/src/main/java/com/ots/project/exam/controller/SysUserExtendController.java
index ed81f52..ede4716 100644
--- a/src/main/java/com/ots/project/exam/controller/SysUserExtendController.java
+++ b/src/main/java/com/ots/project/exam/controller/SysUserExtendController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;
-
import com.ots.common.constant.UserConstants;
import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.MessageUtils;
@@ -22,29 +21,19 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-/**
- * 鐢ㄦ埛淇℃伅鎵╁睍Controller
- *
- * @author ots
- * @date 2019-11-20
- */
@Controller
@RequestMapping("/exam/extend")
public class SysUserExtendController extends BaseController {
private String prefix = "exam/extend";
-
@Autowired
private IUserService userService;
-
@Autowired
private ISysUserExtendService sysUserExtendService;
-
@RequiresPermissions("exam:extend:view")
@GetMapping()
public ModelAndView extend() {
@@ -61,28 +50,19 @@
map.put("sysUserExtend", sysUserExtend == null ? new SysUserExtend() : sysUserExtend);
return new ModelAndView(prefix + "/extend", map);
}
-
- /**
- * 灞�閮ㄥ埛鏂�
- *
- * @param model
- * @return
- */
+
@RequestMapping("/refresh")
public String localRefresh(Model model) {
User user = ShiroUtils.getSysUser();
SysUserExtend sysUserExtend = sysUserExtendService.selectSysUserExtendById(user.getUserId());
model.addAttribute("user", user);
model.addAttribute("sysUserExtend", sysUserExtend);
- // "test"鏄痶est.html鐨勫悕锛�
- // "table_refresh"鏄痶est.html涓渶瑕佸埛鏂扮殑閮ㄥ垎鏍囧織,
- // 鍦ㄦ爣绛鹃噷鍔犲叆锛歵h:fragment="table_refresh"
+
+
+
return prefix + "/extend::table_refresh";
}
-
- /**
- * 淇敼淇濆瓨鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@RequiresPermissions("exam:extend:edit")
@Log(title = "鐢ㄦ埛淇℃伅鎵╁睍", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@@ -90,11 +70,7 @@
public AjaxResult editSave(SysUserExtend sysUserExtend) {
return toAjax(sysUserExtendService.updateSysUserExtend(sysUserExtend));
}
-
-
- /**
- * 鏌ヨ鐢ㄦ埛淇℃伅鎵╁睍鍒楄〃
- */
+
@RequiresPermissions("exam:extend:list")
@PostMapping("/list")
@ResponseBody
@@ -112,7 +88,6 @@
List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
return getDataTable(list);
}
-
@PostMapping("/list2")
@ResponseBody
public TableDataInfo list2(SysUserExtend sysUserExtend) {
@@ -129,10 +104,7 @@
List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
return getDataTable(list);
}
-
- /**
- * 鏂板淇濆瓨鐢ㄦ埛淇℃伅鎵╁睍
- */
+
@RequiresPermissions("exam:extend:add")
@Log(title = "鐢ㄦ埛淇℃伅鎵╁睍", businessType = BusinessType.INSERT)
@PostMapping("/add")
--
Gitblit v1.9.1