From a0fcede67eeccaacf46f025f655f3c0dc3f5cb8e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 23 Sep 2021 09:30:39 +0800
Subject: [PATCH] 1.自招审批
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 7d3e33d..1e053c9 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -166,8 +166,8 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore 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));
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(pages);
}
/**
@@ -192,17 +192,17 @@
// }
// }
- //根据 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());
- }
- user.setRoleId("1412226235153731586");
+// //根据 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());
+// }
+ //user.setRoleId("1412226235153731586");
userService.submit(user);
// String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
String rtime = null;
--
Gitblit v1.9.3