From 5af3d2fa829a7a454c8ddbb6ffb2a7685ceb9c77 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 16 六月 2025 17:33:50 +0800
Subject: [PATCH] 新增优化1.0
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java
index 0fbf5a7..9553043 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/api/SystemUserController.java
@@ -7,7 +7,7 @@
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
+import com.panzhihua.common.model.vos.west.SystemUserVo;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.westcommittee.annotation.SysLog;
import com.panzhihua.westcommittee.model.entity.*;
@@ -119,14 +119,6 @@
if(collect.size() > 0){
LambdaQueryWrapper<SystemMenu> queryWrapper = new LambdaQueryWrapper<SystemMenu>().in(SystemMenu::getId, collect);
switch (systemUser.getAccountLevel()){
- case 2:
- queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
- "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
- "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
- "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
- "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
- "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del"));
- break;
case 3:
queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
"/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
@@ -213,18 +205,7 @@
@ApiOperation(value = "添加人员", tags = {"西区纪委管理后台-人员管理"})
@SysLog(operatorCategory = "添加账号",operId = 4)
public R add(@RequestBody SystemUser systemUser){
- Integer id = this.getLoginUserInfoWest().getId();
- SystemUser user = systemUserService.getById(id);
- if(2 == user.getAccountLevel() && 1 == systemUser.getAccountLevel()){
- return R.fail("不能添加市级账号");
- }
- if(3 == user.getAccountLevel() && 3 < systemUser.getAccountLevel()){
- return R.fail("不能添加区县和市级账号");
- }
- if(4 == user.getAccountLevel() && 4 < systemUser.getAccountLevel()){
- return R.fail("不能添加街道、区县和市级账号");
- }
long count = systemUserService.count(new LambdaQueryWrapper<SystemUser>().eq(SystemUser::getPhone, systemUser.getPhone()).ne(SystemUser::getStatus, 3));
if(0 < count){
return R.fail("手机号重复。");
@@ -241,8 +222,6 @@
systemUser.setAccountLevel(department.getTier());
systemUser.setStatus(1);
systemUser.setCreateTime(LocalDateTime.now());
- // 2.0.1 默认管理员
- systemUser.setIsAdmin(1);
systemUserService.save(systemUser);
return R.ok();
}
@@ -454,7 +433,7 @@
String jsapiTicket = SignatureUtil.getJsApiTicket(accessToken);
String nonceStr = UUID.randomUUID().toString().replace("-", "");
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-// String url = "https://huacheng.psciio.com/web/sangeshenbian/"; // 当前页面的URL，不包含#及其后面部分
+// String url = "https://huacheng.psciio.com/web/west/"; // 当前页面的URL，不包含#及其后面部分
String url = "http://192.168.110.91:8080/#/pages/Appeal/Appeal/"; // 当前页面的URL，不包含#及其后面部分
String signature = SignatureUtil.getSignature(jsapiTicket, nonceStr, timestamp, url);
--
Gitblit v1.7.1