From 2dd01b961547f39a210683153cfa209211750d45 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Mon, 17 Oct 2022 16:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/GenCodeServiceImpl.java | 2 +- .../master/service/impl/ClassstandardServiceImpl.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 32ff1df..49e47d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -104,7 +104,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 + "'", " sort_num").getResultJSONArray(0); String demo = ""; boolean is_same = true; for (int i = 0; i < ja.size(); i++) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 6485607..35d304f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -206,15 +206,10 @@ public class ClassstandardServiceImpl implements ClassstandardService { JSONObject jo = new JSONObject(); JSONArray ja = new JSONArray(); String pid = (String) whereJson.get("pid"); - String base_data_type = (String) whereJson.get("base_data_type"); - String where = ""; - if (!StrUtil.isEmpty(base_data_type)) { - where = "AND base_data_type = '" + base_data_type + "'"; - } if (pid == null || pid.equals("0")) { - ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' " + where + " order by class_id").getResultJSONArray(0); + ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' order by class_id").getResultJSONArray(0); } else { - ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("parent_class_id = '" + pid + "' AND is_delete = '0'" + where + " order by class_id").getResultJSONArray(0); + ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("parent_class_id = '" + pid + "' AND is_delete = '0' order by class_id").getResultJSONArray(0); } for (int i = 0; i < ja.size(); i++) { JSONObject mater_jo = ja.getJSONObject(i);