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 | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 9e5c180..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
@@ -26,6 +26,7 @@
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.common.cache.CacheNames;
import org.springblade.core.cache.utils.CacheUtil;
@@ -40,13 +41,10 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.model.ResponseResult;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
+import org.sxkj.system.entity.UserInfo;
import org.sxkj.system.excel.UserExcel;
import org.sxkj.system.excel.UserImporter;
import org.sxkj.system.mapper.DeptMapper;
@@ -83,6 +81,7 @@
private final BladeLogger bladeLogger;
@Autowired
private DeptMapper deptMapper;
+
/**
* 查询单条
*/
@@ -102,11 +101,11 @@
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/info")
public R<UserVO> info(BladeUser user) {
- if(Objects.isNull(user)){
+ if (Objects.isNull(user)) {
return R.fail(401, "token失效了！");
}
User detail = userService.getById(user.getUserId());
- if(Objects.isNull(detail)){
+ if (Objects.isNull(detail)) {
return R.data(null);
}
return R.data(UserWrapper.build().entityVO(detail));
@@ -140,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));
}
@@ -154,7 +153,7 @@
@ApiLog("用户信息新增或者修改")
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- Dept dept=deptMapper.selectById(user.getDeptId());
+ Dept dept = deptMapper.selectById(user.getDeptId());
user.setAreaCode(dept.getAreaCode());
bladeLogger.info("用户信息新增或者修改", user.toString());
return R.status(userService.submit(user));
--
Gitblit v1.9.3