diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index faea2ebc..c270712c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -190,12 +190,14 @@ public class XmTaskController { xmTaskVoList=xmTaskCacheService.getTasks(queryKeys); if(xmTaskVoList==null){ xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 + PageUtils.responePage(m,xmTaskVoList); xmTaskCacheService.putTasks(queryKeys,xmTaskVoList); } }else { xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 + PageUtils.responePage(m,xmTaskVoList); } - PageUtils.responePage(m,xmTaskVoList); + m.put("data",xmTaskVoList); m.put("tips", tips); return m; diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml index 65b133c8..81178a94 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml @@ -56,10 +56,10 @@ sum( ifnull( menu_cnt, 0 ) ) menu_cnt FROM XM.xm_branch_state res - where res.biz_date = DATE_FORMAT(date_sub(now(),INTERVAL 1 DAY), '%Y-%m-%d') + - - + + {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})}