From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 14b44ce..67e1d92 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -44,9 +44,12 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.DigestUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
+import org.springblade.modules.jurisdiction.entity.Jurisdiction;
+import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -88,6 +91,8 @@
private final IDeptService iDeptService;
private final IRoleService roleService;
private final IExperienceService experienceService;
+
+ private final JurisdictionService jurisdictionService;
/**
* 查询单条
@@ -140,8 +145,8 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user);
return R.data(pages);
}
@@ -183,6 +188,16 @@
}
}
+ //根据 deptId 查询dept信息,公安管理员
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Long sid = 1123598813738675201L;
+ if (dept.getParentId().equals(sid)){
+ //获取辖区的数据
+ Jurisdiction jurisdiction = new Jurisdiction();
+ jurisdiction.setDeptName(dept.getDeptName());
+ Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
+ user.setJurisdiction(one.getId().toString());
+ }
return R.status(userService.submit(user));
}
@@ -449,6 +464,10 @@
user.setRoleId(oneRole.getId().toString());
}
}
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
//用户新增
boolean status = userService.save(user);
//获取从业记录
--
Gitblit v1.9.3