Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp

# Conflicts:
#	epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -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,7 +268,7 @@ 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();