#处理部门封存同步bug

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;
     }