From fc6aa27ad4dcfc6746ae2683321c339c02a0f9a6 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Mon, 28 Nov 2022 10:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TAbilityApplicationServiceImpl.java         | 5 ++---
 .../resources/mapper/processForm/TAbilityApplicationDao.xml  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
index eb46c6a8..cb75db58 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
@@ -165,12 +165,11 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
                 if (processInstanceDTO.getProcessVariables().containsKey("backToFirst")) {
                     try {
                         Boolean backToFirst = Boolean.parseBoolean(processInstanceDTO.getProcessVariables().getOrDefault("backToFirst", "false").toString());
-                        if (backToFirst.equals(Boolean.TRUE)) {
+                        if (Boolean.TRUE.equals(backToFirst)) {
                             index.put("backToFirst", "true");
-                        } else {
-                            index.put("backToFirst", "false");
                         }
                     } catch (Exception exception) {
+                        index.put("backToFirst", "false");
                         logger.info(exception.toString());
                     }
                 } else {
diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
index 42e2d7ea..6757df71 100644
--- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
+++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
@@ -66,7 +66,7 @@
 
     <update id="delApplyCamera">
         UPDATE t_ability_application taa
-        SET expire_date = now()
+        SET expire_date = '2022-04-01 00:00:00'
         WHERE id IN
               <foreach collection="ids" item="item" separator="," open="(" close=")">
                   #{item}