Commit 88659bda authored by xixinzhao's avatar xixinzhao

获取登陆人所在公司某个角色的人

parent fc9c8894
...@@ -8,6 +8,9 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto; ...@@ -8,6 +8,9 @@ import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment; import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
import com.yeejoin.amos.boot.module.ugp.api.entity.Project; import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
import java.util.List;
import java.util.Map;
/** /**
* 项目信息表接口类 * 项目信息表接口类
* *
...@@ -17,4 +20,11 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Project; ...@@ -17,4 +20,11 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
public interface IProjectService { public interface IProjectService {
public IPage<ProjectDto> queryProjectPage(String current,String size, Project project); public IPage<ProjectDto> queryProjectPage(String current,String size, Project project);
/**
* 查询登陆人所在公司某个角色的人
* @param roleId 角色id
* @return 用户
*/
List<Map<String, String>> queryUserByRoleId(String roleId);
} }
...@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.ugp.api.service.IProcessRelationService; ...@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.ugp.api.service.IProcessRelationService;
import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify; import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*; import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
import com.yeejoin.amos.component.robot.BadRequest; import com.yeejoin.amos.component.robot.BadRequest;
import com.yeejoin.amos.feign.privilege.Privilege;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -903,5 +904,17 @@ public class ProjectController extends BaseController { ...@@ -903,5 +904,17 @@ public class ProjectController extends BaseController {
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
} }
/**
* 根据角色获取平台用户
* @param roleId 角色id
* @return 用户
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/queryUserByRoleId")
@ApiOperation(httpMethod = "GET",value = "查询登陆人所在公司的某个角色的人", notes = "查询登陆人所在公司的某个角色的人")
public ResponseModel<List<Map<String, String>>> queryUserByRoleId(String roleId) {
return ResponseHelper.buildResponse(projectServiceImpl.queryUserByRoleId(roleId));
}
} }
...@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify; ...@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -554,8 +555,6 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -554,8 +555,6 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
return page; return page;
} }
public List<ProjectDto> getPage(List<ProjectDto> projects){ public List<ProjectDto> getPage(List<ProjectDto> projects){
ArrayList<ProjectDto> list = Lists.newArrayList(); ArrayList<ProjectDto> list = Lists.newArrayList();
for(ProjectDto projectDto:projects){ for(ProjectDto projectDto:projects){
...@@ -984,4 +983,26 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project ...@@ -984,4 +983,26 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
} }
}); });
} }
@Override
public List<Map<String, String>> queryUserByRoleId(String roleId) {
ReginParams reginParams = orgService.getReginParams();
String companyId = String.valueOf(reginParams.getBusinessInfo().getCompanySequenceNbr());
List<Map<String, String>> list = new ArrayList<>();
List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByRoleId(roleId, null, null).getResult();
if (!CollectionUtils.isEmpty(agencyUserModelList)) {
agencyUserModelList.forEach(user -> {
List<CompanyModel> companys = user.getCompanys();
companys.forEach(companyModel -> {
if (String.valueOf(companyModel.getSequenceNbr()).equals(companyId)) {
Map<String, String> map = new HashMap<>(2);
map.put("id", String.valueOf(user.getSequenceNbr()));
map.put("userName", user.getRealName());
list.add(map);
}
});
});
}
return list;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment