From d45e6830c15541053b4d5be1c47afe14842e630a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 六月 2024 17:59:19 +0800
Subject: [PATCH] 用户管理界面，增加部门查询、角色下拉查询、分配密码策略接口，联调修改代码上传
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index c71204f..4543a1b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -105,15 +105,13 @@
* @throws VciBaseException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public DataGrid<SmRoleVO> gridRoles(Map<String, String> queryMap,
- PageHelper pageHelper) throws VciBaseException {
+ public DataGrid<SmRoleVO> gridRoles(Map<String, String> queryMap, PageHelper pageHelper) throws VciBaseException {
if(pageHelper == null){
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("plname");
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(queryMap,SmRoleForPlatform1.class,pageHelper);
- //鎴戜滑涓嶈兘鏄剧ず涓夊憳鍜岀鐞嗗憳鐨勮鑹�
- queryWrapper.eq("pltype","2");
+ //queryWrapper.eq("pltype","2");
List<SmRoleForPlatform1> roleForPlatform1s = boService.selectByQueryWrapper(queryWrapper, SmRoleForPlatform1.class);
DataGrid<SmRoleVO> dataGrid = new DataGrid<>();
if(!CollectionUtils.isEmpty(roleForPlatform1s)){
@@ -522,25 +520,6 @@
public boolean saveRights(String userOid, String[] roleIds) throws PLException {
VciBaseUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭");
//roleIds鍏佽涓虹┖锛屼负绌烘椂娓呯┖褰撳墠鐢ㄦ埛鐨勬潈闄�
- //鍏堟煡閲�
- if(Func.isNotEmpty(roleIds)){
- List<String> repeatRoleOidList = new ArrayList<>();
- //寰幆杩涜鏌ラ噸锛岄伩鍏峣n澶т簬1000
- WebUtil.switchCollectionForOracleIn(Arrays.asList(roleIds)).stream().forEach(deptoids->{
- String sql = "select pluseruid,plroleuid from pluserrole where pluseruid = '" + userOid
- + "' and " + "plroleuid in ("+WebUtil.toInSql(deptoids.toArray(new String[0]))+")";
- List<BusinessObject> cbos = boService.queryBySql(sql, null);
- if(!CollectionUtils.isEmpty(cbos)){
- cbos.stream().forEach(cbo->{
- repeatRoleOidList.add(ObjectTool.getNewBOAttributeValue(cbo,"plroleuid"));
- });
- }
- });
- //绉婚櫎閲嶅鐨�
- List<String> tempList = new ArrayList<>(Arrays.asList(roleIds));
- tempList.removeAll(repeatRoleOidList);
- roleIds = tempList.toArray(new String[tempList.size()]);
- }
return platformClientUtil.getFrameworkService().saveRights(roleIds,new String[]{userOid},new UserEntityInfo());
}
--
Gitblit v1.9.3