|
|
@ -16,8 +16,6 @@ import com.epmet.dto.form.LoginUserDetailsFormDTO; |
|
|
|
import com.epmet.dto.form.ProcessListFormDTO; |
|
|
|
import com.epmet.dto.form.SubAgencyFormDTO; |
|
|
|
import com.epmet.dto.result.*; |
|
|
|
import com.epmet.dto.result.LoginUserDetailsResultDTO; |
|
|
|
import com.epmet.dto.result.ProcessAndCurrentDeptResultDTO; |
|
|
|
import com.epmet.evaluationindex.screen.dto.result.DepartmentNameListResultDTO; |
|
|
|
import com.epmet.feign.EpmetUserOpenFeignClient; |
|
|
|
import com.epmet.feign.GovOrgOpenFeignClient; |
|
|
@ -270,11 +268,11 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
|
|
|
|
|
|
|
|
|
//3、获取下一级组织机构\网格
|
|
|
|
if( customerAgencyDTO.getData().getLevel() == "community" ){ |
|
|
|
if ("community".equals(customerAgencyDTO.getData().getLevel())) { |
|
|
|
//取下级网格
|
|
|
|
Result<List<GridByStaffResultDTO>> gridListResult = govOrgOpenFeignClient.listGridsbystaffid(userId); |
|
|
|
List<GridByStaffResultDTO> gridList = gridListResult.getData(); |
|
|
|
for(int i=0;i<gridList.size();i++){ |
|
|
|
for (int i = 0; i < gridList.size(); i++) { |
|
|
|
ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO(); |
|
|
|
subAgencyDto.setOrgId(agencyId); |
|
|
|
subAgencyDto.setOrgName(customerAgencyDTO.getData().getOrganizationName()); |
|
|
|