From ec37a0bddbec09bab3eb23e7858a9a6a633d28c6 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 05 May 2022 16:21:25 +0800 Subject: [PATCH] 20220505 --- zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java b/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java index 4673d29..4f589bf 100644 --- a/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java +++ b/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java @@ -2,7 +2,7 @@ import com.matrix.core.constance.MatrixConstance; import com.matrix.system.common.dao.UtilDao; -import com.matrix.system.hive.plugin.util.DateUtils; +import com.matrix.core.tools.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -87,6 +87,8 @@ public boolean updateCheckRepeatTowColumn(String tableName, String column1, Object value1, String column2, Object value2, String idName, Object idValue) { HashMap<String, Object> query = excuteTow(tableName, column1, value1, column2, value2); + + return query != null && !query.get(idName).equals(idValue); } @@ -166,11 +168,11 @@ int s=Integer.parseInt(max); s=s+1; if(s>=1000){ - return DateUtils.getTimeCode(); + return DateUtil.getTimeCode(); } return s>=10?(s>=100?s+"":"00"+s):"000"+s; // 计算 转型 }catch(Exception e){ - return DateUtils.getTimeCode(); + return DateUtil.getTimeCode(); } -- Gitblit v1.9.1