From cccbcc5f5ba2e6ff6cb2a8eb84ee81e801e0a3df Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 25 七月 2024 13:40:50 +0800
Subject: [PATCH] 短信时间转换
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 3175f4f..a90d71f 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
@@ -13,6 +13,7 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.system.domain.bo.editBo.UserDeptBo;
+import com.project.system.domain.vo.SysUserResultVo;
import com.project.system.domain.vo.SysUserVo;
import com.project.system.service.*;
import io.swagger.annotations.ApiImplicitParam;
@@ -52,7 +53,7 @@
public TableDataInfo list(SysUser user)
{
startPage();
- List<SysUser> list = userService.selectUserList(user);
+ List<SysUser> list = userService.selectUserListCommon(user);
return getDataTable(list);
}
@@ -61,7 +62,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, "鐢ㄦ埛鏁版嵁");
}
@@ -112,13 +113,15 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
-
+ user.setPassword(user.getPhonenumber());
if (user.getDeptId()!=null){
user.setUserType("01");
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
user.setUserType("00");
user.setRecommendPhone(deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).toString());
+ } else {
+ user.setUserType("01");
}
}
@@ -153,9 +156,12 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ user.setPassword(user.getPhonenumber());
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");
}
}
@@ -195,7 +201,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)
@@ -222,6 +228,13 @@
public AjaxResult batchUserDeptSave(@RequestBody UserDeptBo bo)
{
return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
+ }
+
+ @ApiOperation("鐢ㄦ埛澶氭満鏋勨�斺�旀満鏋勬爲")
+ @GetMapping("/batchUserDeptTree")
+ public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
+ {
+ return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
}
@ApiOperation("浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜")
@@ -313,20 +326,20 @@
return AjaxResult.success(userService.doImport(list, deptId));
}
-// @ApiOperation(value = "鏍￠獙瀵煎叆淇℃伅")
-// @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅鏍￠獙" , businessType = BusinessType.OTHER)
-// @PostMapping("/checkImport")
-// public AjaxResult checkImport(@RequestBody SysCompanyResultVo resultVo)
-// {
-// return AjaxResult.success(userService.checkImport(resultVo));
-// }
-//
-// @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
-// @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
-// @PostMapping("/saveImport")
-// public AjaxResult saveImport(@RequestBody SysCompanyResultVo resultVo)
-// {
-// return toAjax(userService.saveImport(resultVo) ? 1 : 0);
-// }
+ @ApiOperation(value = "鏍￠獙瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅鏍￠獙" , businessType = BusinessType.OTHER)
+ @PostMapping("/checkImport")
+ public AjaxResult checkImport(@RequestBody SysUserResultVo resultVo)
+ {
+ return AjaxResult.success(userService.checkImport(resultVo));
+ }
+
+ @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
+ @PostMapping("/saveImport")
+ public AjaxResult saveImport(@RequestBody SysUserResultVo resultVo)
+ {
+ return toAjax(userService.saveImport(resultVo) ? 1 : 0);
+ }
}
--
Gitblit v1.9.1