From b66d536fcbe7776a4974ebe439cf8719db55062e Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 17 Nov 2022 10:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/modules/system/service/impl/GenCodeServiceImpl.java    | 4 ++--
 .../src/main/java/org/nl/modules/system/util/CodeUtil.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
index 7085fbab..2cc3a18c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
@@ -99,7 +99,7 @@ public class GenCodeServiceImpl implements GenCodeService {
         //如果flag=1就执行更新数据库的操作
         String flag = (String) form.get("flag");
         WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
-        JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0);
+        JSONArray ja = wo.query("code_rule_id = '" + id + "' FOR UPDATE").getResultJSONArray(0);
         String demo = "";
         boolean is_same = true;
         for (int i = 0; i < ja.size(); i++) {
@@ -174,7 +174,7 @@ public class GenCodeServiceImpl implements GenCodeService {
         //如果flag=1就执行更新数据库的操作
         String flag = (String) form.get("flag");
         WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
-        JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0);
+        JSONArray ja = wo.query("code_rule_id = '" + id + "'  FOR UPDATE").getResultJSONArray(0);
         String demo = "";
         boolean is_same = true;
         for (int i = 0; i < ja.size(); i++) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
index 13781205..3a8b570d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 
 public class CodeUtil {
 
-    public  static synchronized String getNewCode(String ruleCode){
+    public  static  String getNewCode(String ruleCode){
         GenCodeService service=new GenCodeServiceImpl();
         String flag = "1";
         HashMap<String,String> map = new HashMap<>();
@@ -16,7 +16,7 @@ public class CodeUtil {
         return service.codeDemo(map);
     }
 
-    public  static synchronized String getNewCode2(String ruleCode){
+    public  static  String getNewCode2(String ruleCode){
         GenCodeService service=new GenCodeServiceImpl();
         String flag = "1";
         HashMap<String,String> map = new HashMap<>();