任务查询增加按技能标签查找

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

@@ -5,6 +5,7 @@ import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
+import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmMenuExchange;
 import com.xm.core.service.XmMenuExchangeService;
 import com.xm.core.service.push.XmMenuPushMsgService;
@@ -81,6 +82,9 @@ public class XmMenuExchangeController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmMenuExchange, "ids");
 		PageUtils.startPage(xmMenuExchange);
+		if(  !StringUtils.hasText((String) xmMenuExchange.get("branchId"))){
+			xmMenuExchange.put("branchId",LoginUtils.getCurrentUserInfo().getBranchId());
+		}
 		List<Map<String,Object>>	xmMenuExchangeList = xmMenuExchangeService.selectListMapByWhere(xmMenuExchange);	//列出XmMenuExchange列表
 		PageUtils.responePage(m, xmMenuExchangeList);
 		m.put("data",xmMenuExchangeList);

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

@@ -105,6 +105,7 @@ public class XmTaskController {
 	public Map<String,Object> getTask( @RequestParam Map<String,Object> xmTask){
 		Map<String,Object> m = new HashMap<>();
 		RequestUtils.transformArray(xmTask, "ids");
+		RequestUtils.transformArray(xmTask, "skillIds");
 		PageUtils.startPage(xmTask);
 		List<Map<String,Object>> xmTaskVoList = xmTaskService.getTask(xmTask);	//列出XmTask列表
 		PageUtils.responePage(m,xmTaskVoList);