Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/DesktopFacadeProvider.java

@@ -48,10 +48,7 @@ import com.lc.ibps.org.party.domain.PartyUserNavigate;
 import com.lc.ibps.org.party.persistence.dao.PartyUserCalendarDao;
 import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateDao;
 import com.lc.ibps.org.party.persistence.entity.*;
-import com.lc.ibps.org.party.repository.PartyEmployeeRepository;
-import com.lc.ibps.org.party.repository.PartyPositionRepository;
-import com.lc.ibps.org.party.repository.PartyUserCalendarRepository;
-import com.lc.ibps.org.party.repository.PartyUserNavigateRepository;
+import com.lc.ibps.org.party.repository.*;
 import com.lc.ibps.org.spi.SpiUserService;
 import com.lc.ibps.org.spi.SpiUserServiceUtil;
 import io.swagger.annotations.Api;
@@ -104,6 +101,8 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 	private InnerMessageRepository innerMessageRepository;
 	@Autowired
 	private PartyUserNavigateRepository userNavigateRepository;
+	@Resource
+	private PartyEntityRepository partyEntityRepository;
 
 	@Resource
 	private PartyUserNavigateDao navigateDao;
@@ -656,16 +655,22 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 
 			PartyEmployeePo employeePo = partyEmployeeRepository.get(ContextUtil.getCurrentUserId());
 			String position = employeePo.getPositions().split(",")[0];
-			if (BeanUtils.isNotEmpty(position)){
-				queryFilter.addFilter("DEP_ID_", position, QueryOP.EQUAL);
+			PartyEntityPo entityPo = partyEntityRepository.get(position);
+			// 根据用户id查询用户所属医院（地点）  查询 ibps_party_entity 表 path_ 字段第二级，没有则查询第一级
+			String diDian = entityPo.getPath().split("\\.")[1];
+			if (BeanUtils.isEmpty(diDian)){
+				diDian = entityPo.getPath().split("\\.")[0];
+			}
+			if (BeanUtils.isNotEmpty(diDian)){
+				queryFilter.addFilter("TYPE_", diDian, QueryOP.EQUAL);
 			}
 			List<NewsPo> list = newsRepository.query(queryFilter);
 			result.setData(list);
-			queryFilter.setPage(null);
-			int totalCount = newsRepository.query(queryFilter).size();
-			Map<String,Object> map = new HashMap<>();
-			map.put("totalCount",totalCount);
-			result.setVariables(map);
+//			queryFilter.setPage(null);
+//			int totalCount = newsRepository.query(queryFilter).size();
+//			Map<String,Object> map = new HashMap<>();
+//			map.put("totalCount",totalCount);
+//			result.setVariables(map);
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
 		}