ugp修改获取当前登陆人角色接口逻辑

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/PipeController.java

@@ -18,6 +18,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
@@ -28,6 +29,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -116,6 +118,11 @@ public class PipeController extends BaseController {
         FeignClientResult<AgencyUserModel> agencyUserModelFeignClientResult = Privilege.agencyUserClient.queryByUserId(exeUserId);
         if (!ObjectUtils.isEmpty(agencyUserModelFeignClientResult) && !ObjectUtils.isEmpty(agencyUserModelFeignClientResult.getResult()) && !ObjectUtils.isEmpty(agencyUserModelFeignClientResult.getResult().getOrgRoles())) {
             Map<Long, List<RoleModel>> orgRoles = agencyUserModelFeignClientResult.getResult().getOrgRoles();
+            Map<Long, List<DepartmentModel>> departmentModelList =  agencyUserModelFeignClientResult.getResult().getCompanyDepartments();
+            if(!ValidationUtil.isEmpty(departmentModelList) && !ValidationUtil.isEmpty(departmentModelList.get(companyId))){
+                List<DepartmentModel> departmentModels = departmentModelList.get(companyId);
+                companyId = departmentModels.iterator().next().getSequenceNbr();
+            }
             if (!ObjectUtils.isEmpty(orgRoles)) {
                 List<RoleModel> roleModels = orgRoles.get(companyId);
                 return ResponseHelper.buildResponse(roleModels);