From 774ac43c47d82d2b581c2c846a1dfc7b9ec46e64 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 25 Feb 2026 16:08:11 +0800
Subject: [PATCH] 机构，角色，用户 新增 sysType 字段
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
index e2941c0..38f02b4 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java
@@ -139,7 +139,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> page(User user, Query query, Long deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -157,38 +157,6 @@
user.setAreaCode(dept.getAreaCode());
bladeLogger.info("用户信息新增或者修改", user.toString());
return R.status(userService.submit(user));
- }
-
- /**
- * 用户信息新增或者修改-对外
- */
- @PostMapping("/submitExternal")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "新增或修改用户", notes = "传入User,新增或修改用户")
- @ApiLog("用户信息新增或者修改-对外")
- public R submitExternal(@Valid @RequestBody User user) {
- CacheUtil.clear(USER_CACHE);
-
- boolean isRet = false;
-
- UserInfo userInfo = userService.userInfo("000000", user.getAccount());
- if (userInfo != null && userInfo.getUser() != null) {
- bladeLogger.info("用户信息修改", user.toString());
- user.setId(userInfo.getUser().getId());
- user.setDeptId(userInfo.getUser().getDeptId());
- user.setRoleId(userInfo.getUser().getRoleId());
- isRet = userService.updateUser(user);
- } else {
- Dept dept = deptMapper.selectById(1123598813738675201L);
- user.setAreaCode(dept.getAreaCode());
- user.setPassword("jadk@2026");
- user.setDeptId(user.getDeptId() == null ? String.valueOf(dept.getId()) : user.getDeptId());
- user.setRoleId(user.getRoleId() == null ? "2011678430358691842" : user.getRoleId());
- isRet = userService.submit(user);
- bladeLogger.info("用户信息新增", user.toString());
- }
-
- return R.status(isRet);
}
/**
--
Gitblit v1.9.3