From 360accaf390a8541a325936522ad863ef7b04632 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十二月 2023 16:40:23 +0800
Subject: [PATCH] 密码修改对话框修改，密码修改原密码传参修改
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
index e0eb813..0eb2627 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
@@ -1,28 +1,27 @@
package com.vci.ubcs.system.service.impl;
-import cn.hutool.db.ds.pooled.ConnectionWraper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.entity.ClassifyAuth;
+import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.mapper.ClassifyAuthMapper;
import com.vci.ubcs.system.service.IClassifyAuthService;
+import com.vci.ubcs.system.service.IMenuService;
import com.vci.ubcs.system.vo.ClassifyAuthVO;
+import com.vci.ubcs.system.vo.MenuVO;
import com.vci.ubcs.system.wrapper.ClassifyAuthWrapper;
import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import org.redisson.api.condition.Conditions;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -35,6 +34,8 @@
public class ClassifyAuthServiceImpl extends ServiceImpl<ClassifyAuthMapper,ClassifyAuth> implements IClassifyAuthService {
private final ClassifyAuthMapper classifyAuthMapper;
+
+ private final IMenuService menuService;
/**
* 鍒嗙被鎺堟潈淇濆瓨鎺ュ彛
@@ -80,4 +81,39 @@
return new ArrayList<ClassifyAuthVO>();
}
+ /**
+ * 鏌ヨ璇ュ垎绫讳笅锛屽綋鍓嶇櫥褰曠殑瑙掕壊鏈夊摢浜涙寜閽潈闄�
+ * @param classifyId
+ * @return
+ */
+ public Map<String,Boolean> getAuthButtonList(String classifyId){
+ final String roleIds = AuthUtil.getUser().getRoleId();
+ // 鍏堟煡璇㈡寜閽甶d鍒楄〃
+ LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
+ .lambda().eq(ClassifyAuth::getClassifyId, classifyId)
+ .in(ClassifyAuth::getRoleId, roleIds);
+ List<ClassifyAuth> classifyAuths = this.classifyAuthMapper.selectList(wrapper);
+ if(classifyAuths.size()>1){
+ throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ }
+ // 鏄惁涓鸿秴绠�
+ Boolean isAdmin = VciBaseUtil.checkAdminTenant();
+ // 鏈厤缃寜閽潈闄�
+ if(!isAdmin && (classifyAuths.isEmpty() || Func.isBlank(classifyAuths.get(0).getButtonIds()))){
+ return new HashMap<>();
+ }
+ List<String> condition1 = new ArrayList<>();
+ // 濡傛灉涓嶆槸瓒呯鐢ㄦ埛
+ if(!isAdmin){
+ condition1.addAll(Arrays.asList(classifyAuths.get(0).getButtonIds().split(",")));
+ }
+ List<Menu> menuList = menuService.getMenuListById(condition1,"1648879284590858241");
+ if(menuList.isEmpty()){
+ return new HashMap<>();
+ }
+ Map<String, Boolean> buttonMaps = menuList.stream()
+ .collect(Collectors.toMap(Menu::getCode, menu -> true));
+ return buttonMaps;
+ }
+
}
--
Gitblit v1.9.3