Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java

@@ -1,11 +1,13 @@
package com.vci.frameworkcore.compatibility.impl;

import com.vci.corba.omd.data.BusinessObject;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.enumpck.RoleClassifyEnum;
import com.vci.frameworkcore.enumpck.RoleControlAreaEnum;
import com.vci.frameworkcore.model.SmRoleForPlatform1;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -250,12 +252,12 @@
         if(!CollectionUtils.isEmpty(roleVOS)){
            roleVOList.addAll(roleVOS);
            String sql = "select pluseruid,plroleuid from pluserrole where pluseruid in (" + WebUtil.toInSql(userOids.toArray(new String[0])) + ")";
            List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryBySql(sql, null);
            List<BusinessObject> cbos = boService.queryBySql(sql, null);
            if(!CollectionUtils.isEmpty(cbos)){
               cbos.stream().forEach(cbo->{
                  String userOid = cbo.getAttributeValue("pluseruid");
                  String userOid = ObjectTool.getBOAttributeValue(cbo,"pluseruid");
                  List<String> roleOids = userRoleOidMap.getOrDefault(userOid,new ArrayList<>());
                  roleOids.add(cbo.getAttributeValue("plroleuid"));
                  roleOids.add(ObjectTool.getBOAttributeValue(cbo,"plroleuid"));
                  userRoleOidMap.put(userOid,roleOids);
               });
            }
@@ -415,12 +417,12 @@
         if(!CollectionUtils.isEmpty(roleVOS)){
            roleVOList.addAll(roleVOS);
            String sql = "select plroleoid,plfuncoid from plroleright where plfuncoid in (" + WebUtil.toInSql(userOids.toArray(new String[0])) + ")";
            List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryBySql(sql, null);
            List<BusinessObject> cbos = boService.queryBySql(sql, null);
            if(!CollectionUtils.isEmpty(cbos)){
               cbos.stream().forEach(cbo->{
                  String funcOid = cbo.getAttributeValue("plfuncoid");
                  String funcOid = ObjectTool.getBOAttributeValue(cbo,"plfuncoid");
                  List<String> roleOids = funcRoleOidMap.getOrDefault(funcOid,new ArrayList<>());
                  roleOids.add(cbo.getAttributeValue("plroleoid"));
                  roleOids.add(ObjectTool.getBOAttributeValue(cbo,"plroleoid"));
                  funcRoleOidMap.put(funcOid,roleOids);
               });
            }