[task-1595]首页待办返回记录数，已办数量和已办列表数据对不上

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

@@ -638,22 +638,34 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 						queryFilter.addParamsFilter("ID_", newsIdStrList);
 					}else{
 						DefaultFieldLogic fieldLogic = new DefaultFieldLogic(FieldRelation.OR);
-						fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_1", StringPool.Y, QueryOP.EQUAL);// 添加一个字段
-						fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_2", StringPool.YES, QueryOP.EQUAL);// 添加一个字段
-						queryFilter.addGroup(fieldLogic);// 添加一个分组
+						fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_1", StringPool.Y, QueryOP.EQUAL);
+						fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_2", StringPool.YES, QueryOP.EQUAL);
+						queryFilter.addGroup(fieldLogic);
 					}
 				}
 				else {
 					//无组织信息，查看公共公告
 					DefaultFieldLogic fieldLogic = new DefaultFieldLogic(FieldRelation.OR);
-					fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_1", StringPool.Y, QueryOP.EQUAL);// 添加一个字段
-					fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_2", StringPool.YES, QueryOP.EQUAL);// 添加一个字段
-					queryFilter.addGroup(fieldLogic);// 添加一个分组
+					fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_1", StringPool.Y, QueryOP.EQUAL);
+					fieldLogic.addFilter("IS_PUBLIC_", "IS_PUBLIC_2", StringPool.YES, QueryOP.EQUAL);
+					queryFilter.addGroup(fieldLogic);
 				}
 			}
 			// 公告栏目只显示已发布公告
 			queryFilter.addFilter("STATUS_", NewsStatus.PUBLISH.getValue(), QueryOP.EQUAL);
-			result.setData(newsRepository.query(queryFilter));
+
+			PartyEmployeePo employeePo = partyEmployeeRepository.get(ContextUtil.getCurrentUserId());
+			String position = employeePo.getPositions().split(",")[0];
+			if (BeanUtils.isNotEmpty(position)){
+				queryFilter.addFilter("DEP_ID_", position, 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);
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
 		}