From 4466b8695a1a43cda210614508bf94534e7b0ab7 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 25 九月 2023 20:58:28 +0800
Subject: [PATCH] 提交惠州惠新配置信息
---
igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java | 52 ++--------------------------------------------------
1 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
index 63d2fcd..1b3f8b3 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
@@ -5,7 +5,6 @@
import com.bstek.dorado.util.Assert;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.RedisConst;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
@@ -191,12 +190,12 @@
if (null != parameter) {
String str = (String) parameter.get("parentCode");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and parentCode =:parentCode ";
args.put("parentCode", str);
}
str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
+ if (StringUtils.isNotEmpty(str)) {
hql += " and (name like :name or code like:code) ";
args.put("name", "%" + str + "%");
args.put("code", "%" + str + "%");
@@ -206,53 +205,6 @@
hql += " order by code ";
return this.query(hql, args);
}
-
- @Override
- public void pagFoodLocationData(Page<DicFoodOrigin> page, Map<String, Object> param)
- throws Exception {
-
- String hql = " from " + DicFoodOrigin.class.getName() + " where 1=1";
-
- Map<String, Object> args = new HashMap<String, Object>();
-
- if (null != param) {
- String str = (String) param.get("code");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and code like :code";
- args.put("code", "%" + str + "%");
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like :name";
- args.put("name", "%" + str + "%");
- }
-
- str = (String) param.get("disabledTag");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and disabledTag = :disabledTag";
- args.put("disabledTag", str);
- }
-
- str = (String) param.get("key");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and (name like :name or code like:code or simple like:simple) ";
- args.put("name", "%" + str + "%");
- args.put("code", "%" + str + "%");
- args.put("simple", "%" + str.toUpperCase() + "%");
- }
- }
-
- String coutHql = "select count(*) " + hql;
-
- hql += " order by sort";
-
- if (args.isEmpty()) {
- this.pagingQuery(page, hql, coutHql);
- } else {
- this.pagingQuery(page, hql, coutHql, args);
- }
- }
-
@Override
public String copy2Target(String sourceId, String targetId) {
--
Gitblit v1.9.3