From 1cebcbd79fd408e17aa59e434b396476e117fc1c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 7543d2e..86cedca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -33,11 +33,13 @@
private final TokenService tokenService;
private final TAppUserService appUserService;
+ private final TUserMajorService userMajorService;
@Autowired
- public TAppUserController(TokenService tokenService, TAppUserService appUserService) {
+ public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
+ this.userMajorService = userMajorService;
}
/**
@@ -56,14 +58,30 @@
* 添加人员
*/
// @PreAuthorize("@ss.hasPermi('system:user:addUser')")
- @ApiOperation(value = "添加人员")
+ @ApiOperation(value = "添加人员",notes = "请求参数：TAppUserDTO对象",response = TAppUserDTO.class)
@PostMapping(value = "/api/t-app-user/addUser")
public R<?> addUser(@RequestBody String param) {
- TAppUser tAppUser = JSON.parseObject(param, TAppUser.class);
- String pwd = SecurityUtils.encryptPassword(tAppUser.getPassword());
- tAppUser.setPassword(pwd);
- tAppUser.setState(1);
- appUserService.save(tAppUser);
+ TAppUserDTO dto = JSON.parseObject(param, TAppUserDTO.class);
+ if(!StringUtils.hasLength(dto.getAccount())){
+ return R.fail("请输入账号");
+ }
+ if (appUserService.isExit(dto)) {
+ return R.fail("该账号已存在");
+ }
+ List<TUserMajor> userMajors = dto.getUserMajors();
+ if(CollectionUtils.isEmpty(userMajors)){
+ return R.fail("请选择专业");
+ }
+ String pwd = SecurityUtils.encryptPassword(dto.getPassword());
+ dto.setPassword(pwd);
+ dto.setState(1);
+ appUserService.save(dto);
+
+ for (TUserMajor userMajor : userMajors) {
+ userMajor.setAppUserId(dto.getId());
+ }
+ userMajorService.saveBatch(userMajors);
+
return R.ok();
}
@@ -74,13 +92,22 @@
@ApiOperation(value = "编辑人员", response = TAppUser.class)
@PostMapping(value = "/api/t-app-user/updateUser")
public R<?> updateUser(@RequestBody String param) {
- TAppUser tAppUser = JSON.parseObject(param, TAppUser.class);
- if(tAppUser.getPassword()!=null && !tAppUser.getPassword().isEmpty()){
- String pwd = SecurityUtils.encryptPassword(tAppUser.getPassword());
- tAppUser.setPassword(pwd);
+ TAppUserDTO dto = JSON.parseObject(param, TAppUserDTO.class);
+ if (appUserService.isExit(dto)) {
+ return R.fail("该账号已存在");
}
- tAppUser.setState(1);
- appUserService.updateById(tAppUser);
+ List<TUserMajor> userMajors = dto.getUserMajors();
+ if(dto.getPassword()!=null && !dto.getPassword().isEmpty()){
+ String pwd = SecurityUtils.encryptPassword(dto.getPassword());
+ dto.setPassword(pwd);
+ }
+ dto.setState(1);
+ appUserService.updateById(dto);
+ userMajorService.remove(Wrappers.lambdaQuery(TUserMajor.class).eq(TUserMajor::getAppUserId,dto.getId()));
+ for (TUserMajor userMajor : userMajors) {
+ userMajor.setAppUserId(dto.getId());
+ }
+ userMajorService.saveBatch(userMajors);
return R.ok();
}
--
Gitblit v1.7.1