From 26a1c623741a16ae39997e83f2f433e20004d4f4 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 15 May 2024 14:30:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java | 2 ++ .../com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java index 77caab0..96558ad 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java @@ -57,6 +57,7 @@ public class ActivitiesServiceImpl implements ActivitiesService { if (list.size() > 0) { throw new ApiException("名称已存在"); } + item.setTermCount(item.getTerms().size()); item.setCreateTime(new Date()); item.setUpdateTime(new Date()); int r = mapper.insertSelective(item); @@ -89,6 +90,7 @@ public class ActivitiesServiceImpl implements ActivitiesService { if (list.size() > 0) { throw new ApiException("名称已存在"); } + item.setTermCount(item.getTerms().size()); item.setUpdateTime(new Date()); mapper.updateByPrimaryKey(item); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java index b14b10b..bcdc8de 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java @@ -115,6 +115,7 @@ public class TerminalExtServiceImpl implements TerminalExtService { } criteria.andIdIn(idList); } + example.setOrderByClause("dy_id asc, line_id asc, tower_id asc, cmdid asc"); PageUtils.SetPage(vo.getPageindex(), vo.getPagesize()); List list = viewDyLineTowerTerminalsDao.selectByExample(example);