From 08d150cada89b562b2deef885f4c5e8e18bc55b0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 18 Sep 2023 17:21:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/mapper/LawsCommonMapper.java | 8 ++++++++
 .../modules/laws/common/mapper/xml/LawsCommonMapper.xml   | 7 +++++++
 .../laws/common/service/impl/LawsCommonServiceImpl.java   | 4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java
index cadd3a91..7e0005a6 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/LawsCommonMapper.java
@@ -64,6 +64,14 @@ public interface LawsCommonMapper {
     int deleteByIdsAndModule(@org.apache.ibatis.annotations.Param("tableName") String tableName,
                              @org.apache.ibatis.annotations.Param("idList") List<String> idList);
 
+    /**
+     * @Author: caihaohan
+     * @Date: 2023/9/18
+     * @Description: 根据ids和模块标识逻辑删除
+     **/
+    int logicalDeleteByIdsAndModule(@org.apache.ibatis.annotations.Param("tableName") String tableName,
+                             @org.apache.ibatis.annotations.Param("idList") List<String> idList);
+
     /**
      * @Author: liao
      * @Date: 2023/8/24 15:00
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
index be8650ee..a37f0efa 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
@@ -28,6 +28,13 @@
         </foreach>
     </delete>
 
+    <update id="logicalDeleteByIdsAndModule">
+        UPDATE ${tableName} SET del_flag = 1 WHERE id IN
+        <foreach collection="idList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="commonEdit">
         UPDATE ${tableName}
         SET ${updateSql}
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 30c85e99..d12a4c1a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -538,7 +538,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         }
         List<String> idList = Arrays.asList(ids.split(","));
         // 操作数据库进行删除操作
-        int rowsDeleted = lawsCommonMapper.deleteByIdsAndModule(tableName, idList);
+        int rowsDeleted = lawsCommonMapper.logicalDeleteByIdsAndModule(tableName, idList);
         if (rowsDeleted > 0) {
             return MessageUtils.getMessage(ResultCommon.OK);
         }
@@ -687,7 +687,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         String commonInsertValues = "'" + id + "','" + sysUser.getUsername() + "',"
                 + FieldCommon.STR_TO_DATE_PREFIX + sdf.format(new Date()) + FieldCommon.STR_TO_DATE_SUFFIX + ",'" + sysUser.getUsername() + "',"
                 + FieldCommon.STR_TO_DATE_PREFIX + sdf.format(new Date()) + FieldCommon.STR_TO_DATE_SUFFIX + ",'" + sysUser.getOrgCode() + "'";
-        fieldsBuilder.append("id,create_by,create_time,update_by,update_time,sys_code");
+        fieldsBuilder.append("id,create_by,create_time,update_by,update_time,org_code");
         valuesBuilder.append(commonInsertValues);
     }