From 6318fe78a42eb18abe0ae5d83b459df9232ab1f0 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 5 Mar 2024 15:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/datasource/mappers/OrganizationMapperEx.java   | 1 +
 .../com/jsh/erp/service/organization/OrganizationService.java  | 1 -
 .../src/main/resources/mapper_xml/OrganizationMapperEx.xml     | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
index 23df4003..9161ae0e 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
@@ -28,5 +28,6 @@ public interface OrganizationMapperEx {
     int batchDeleteOrganizationByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 
     int editOrganization(Organization org);
+
     List <Organization> getOrganizationRootByIds(@Param("ids") String ids[]);
 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
index a9ca30e3..09dd15fb 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
@@ -83,7 +83,6 @@ public class OrganizationService {
     public int updateOrganization(JSONObject obj, HttpServletRequest request)throws Exception {
         Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class);
         organization.setUpdateTime(new Date());
-        organization.setDeleteFlag("0");
         int result=0;
         try{
             result=organizationMapperEx.editOrganization(organization);
diff --git a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml
index 737cb140..4a65be1a 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml
@@ -84,8 +84,7 @@
       update jsh_organization
       set update_time=#{updateTime},
       org_no = #{orgNo},org_abr = #{orgAbr},
-      delete_flag = #{deleteFlag},parent_id = #{parentId},
-      sort = #{sort},remark = #{remark}
+      parent_id = #{parentId}, sort = #{sort},remark = #{remark}
       where id =#{id}
     </update>