From d7cbeb2ed120af3db849aecfd89ac9b9980a60f1 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 04 九月 2024 11:11:57 +0800
Subject: [PATCH] 列表
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index dce177b..a5714ee 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -1,6 +1,7 @@
package com.project.admin.controller.system;
import com.project.common.annotation.Log;
+import com.project.common.annotation.RepeatSubmit;
import com.project.common.constant.UserConstants;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
@@ -53,7 +54,7 @@
public TableDataInfo list(SysUser user)
{
startPage();
- List<SysUser> list = userService.selectUserList(user);
+ List<SysUser> list = userService.selectUserListCommon(user);
return getDataTable(list);
}
@@ -62,7 +63,7 @@
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user)
{
- List<SysUser> list = userService.selectUserList(user);
+ List<SysUser> list = userService.selectUserListCommon(user);
ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
}
@@ -120,6 +121,8 @@
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
user.setUserType("00");
user.setRecommendPhone(deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).toString());
+ } else {
+ user.setUserType("01");
}
}
@@ -158,6 +161,8 @@
if (user.getDeptId()!=null){
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
+ user.setUserType("00");
+ } else {
user.setUserType("01");
}
}
@@ -197,7 +202,7 @@
/**
* 閲嶇疆瀵嗙爜
*/
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
@@ -333,6 +338,7 @@
@ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
@Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
@PostMapping("/saveImport")
+ @RepeatSubmit
public AjaxResult saveImport(@RequestBody SysUserResultVo resultVo)
{
return toAjax(userService.saveImport(resultVo) ? 1 : 0);
--
Gitblit v1.9.1