From 3ab667a5d35d025fcd73b0493b02e07d98c5679a Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 16 Aug 2023 12:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
index 91f54c7..c0abbe0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
@@ -66,10 +66,10 @@
public boolean auditByGuid(TbAttResBase tbAttResBase) {
// 查询是否存在
TbAttResBase detail = baseMapper.getDetailByGuid(tbAttResBase.getGuid());
- // 更新审核日志
- setUpdateCheckLog(detail,tbAttResBase);
// 更新操作日志
setUpdateLog(detail,tbAttResBase);
+ // 更新审核日志
+ setUpdateCheckLog(detail,tbAttResBase);
if (null!=detail){
tbAttResBase.setGuid(detail.getGuid());
}
@@ -78,7 +78,7 @@
tbAttResBase.setCheckState(0);
}
// 更新数据
- int i = baseMapper.updateByGuid(tbAttResBase);
+ int i = baseMapper.updateById(tbAttResBase);
if (i>0){
return true;
}
@@ -94,7 +94,7 @@
int i = 0;
if (null!=tbAttResBase.getGuid()){
// 更新
- i = baseMapper.updateByGuid(tbAttResBase);
+ i = baseMapper.updateById(tbAttResBase);
}else {
i = baseMapper.insert(tbAttResBase);
}
@@ -158,7 +158,7 @@
fillName = "审核";
}
if (newTbAttResBase.getCheckState()==3){
- fillName = "退回" + (null==newTbAttResBase.getLog()?"":":" + newTbAttResBase.getLog());
+ fillName = "退回" + (null==newTbAttResBase.getCheckLog()?"":":" + newTbAttResBase.getCheckLog());
}
// 拼接
--
Gitblit v1.9.3