From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
index ddf7664..dd9366d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/SystemClientParamsServiceImpl.java
@@ -313,12 +313,12 @@
if (StringUtil.isNullOrEmpty(key)) {
list = systemClientParamsDao.list("from SystemClientParams scp where scp.system.id = ? ",
- new Serializable[] {systemId});
+ start, count, new Serializable[] {systemId});
} else {
list = systemClientParamsDao.list(
"from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)",
- new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"});
+ start, count, new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"});
}
}
@@ -332,21 +332,21 @@
if (systemId == null) {
if (StringUtil.isNullOrEmpty(key)) {
- return systemClientParamsDao.getCount("from SystemClientParams scp");
+ return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp");
} else {
- return systemClientParamsDao.getCount("from SystemClientParams scp where (scp.name like ? or scp.key like ?) ",
+ return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp where (scp.name like ? or scp.key like ?) ",
new Serializable[] { "%" + key + "%" ,"%" + key + "%"});
}
} else {
if (StringUtil.isNullOrEmpty(key)) {
- return systemClientParamsDao.getCount("from SystemClientParams scp where scp.system.id = ? ",
+ return systemClientParamsDao.getCount(" select count(id) from SystemClientParams scp where scp.system.id = ? ",
new Serializable[] {systemId});
} else {
return systemClientParamsDao.getCount(
- "from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)",
+ " select count(id) from SystemClientParams scp where scp.system.id = ? and (scp.name like ? or scp.key like ?)",
new Serializable[] {systemId, "%" + key + "%" ,"%" + key + "%"});
}
}
@@ -355,6 +355,7 @@
@Transactional
+ @Override
public void saveAdd(SystemClientParams scp, List<Long> listId) throws Exception {
if (listId == null || listId.size() == 0) {
--
Gitblit v1.8.0