From c31b5c6cf52d89226f9a1d392541a6e0a5ada0d5 Mon Sep 17 00:00:00 2001
From: WangJie <805650258@qq.com>
Date: Mon, 17 Oct 2022 17:08:28 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=A4=84=E7=90=86=E9=83=A8=E9=97=A8=E5=B0=81?=
 =?UTF-8?q?=E5=AD=98=E5=90=8C=E6=AD=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/weaver/interfaces/mq/RocketmqUtil.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/weaver/interfaces/mq/RocketmqUtil.java b/src/weaver/interfaces/mq/RocketmqUtil.java
index ee0b3371..d7eca180 100644
--- a/src/weaver/interfaces/mq/RocketmqUtil.java
+++ b/src/weaver/interfaces/mq/RocketmqUtil.java
@@ -18,11 +18,11 @@ public class RocketmqUtil {
     private  Lock lock = new ReentrantLock();
     public int updateOrgData(String data)
     {
-        lock.lock();
+
         BaseBean bb = new BaseBean();
         int errcount = 0;
         try{
-
+            lock.lock();
             JSONObject jsonObject = JSONObject.parseObject(data);
             if(jsonObject.containsKey("requestObject"))
             {
@@ -281,6 +281,7 @@ public class RocketmqUtil {
             if("1100".equals(statusCd)){
                 canceled = "1";
             }
+
             bb.writeLog("canceled:"+canceled);
 
             String supdepid = "0";
@@ -318,7 +319,7 @@ public class RocketmqUtil {
 
                 if(!"".equals(deptid))
                 {
-                    if("M".equalsIgnoreCase(actType))
+                    if("M".equalsIgnoreCase(actType)||"D".equalsIgnoreCase(actType))
                     {
                         String deptUpdateSql = " update hrmdepartment set departmentmark=?,departmentname=?,canceled=?," +
                                 " subcompanyid1=?,showorder=?, supdepid=?  where departmentcode=? ";
@@ -329,6 +330,8 @@ public class RocketmqUtil {
                             errcount++;
                         }
                     }
+
+
                 }else{
                     if("A".equalsIgnoreCase(actType))
                     {
@@ -344,7 +347,6 @@ public class RocketmqUtil {
                 }
             }
         }
-
         return errcount;
     }