root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码修复

Browse Source
This commit is contained in:
lyd
2022-10-17 16:02:58 +08:00
parent 868fd28aa3
commit 2dd01b9615
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
View File

@@ -104,7 +104,7 @@ public class GenCodeServiceImpl implements GenCodeService {
//如果flag=1就执行更新数据库的操作 //如果flag=1就执行更新数据库的操作
String flag = (String) form.get("flag"); String flag = (String) form.get("flag");
WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail"); 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 = ""; String demo = "";
boolean is_same = true; boolean is_same = true;
for (int i = 0; i < ja.size(); i++) { for (int i = 0; i < ja.size(); i++) {

9
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
View File

@@ -206,15 +206,10 @@ public class ClassstandardServiceImpl implements ClassstandardService {
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();
String pid = (String) whereJson.get("pid"); 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")) { 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 { } 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++) { for (int i = 0; i < ja.size(); i++) {
JSONObject mater_jo = ja.getJSONObject(i); JSONObject mater_jo = ja.getJSONObject(i);