项目任务查询增加默认按本机构号查询，如果查询的是众包任务，则按全域查询

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -104,7 +104,9 @@ public class XmProjectController {
 
 	        if(StringUtils.isEmpty(xmProjectVo.getCode())) {
 	        	 tips.setFailureMsg("编号不能为空，请修改编号再提交"); 
-	        }else { 
+	        }else if(StringUtils.hasText(xmProjectVo.getBranchId())){
+				tips.setFailureMsg("项目归属机构号不能为空");
+			}else {
 				xmProjectService.saveProject(xmProjectVo);
 				xmProjectService.clearProject(xmProjectVo.getId());
 

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -254,6 +254,11 @@ public class XmTaskController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmTask, "ids");
 		PageUtils.startPage(xmTask);
+		String taskOut= (String) xmTask.get("taskOut");
+		if(!"1".equals(taskOut)){
+			User user = LoginUtils.getCurrentUserInfo();
+			xmTask.put("branchId",user.getBranchId());
+		}
 		List<Map<String,Object>>	xmTaskList = xmTaskService.selectListMapByWhere(xmTask);	//列出XmTask列表
 		PageUtils.responePage(m, xmTaskList);
 		m.put("data",xmTaskList);