From 157dc311f1d8d312bb535292428682a31f6f7cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 14 Mar 2023 13:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91cgform=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../online/cgform/model/OnlComplexModel.java | 36 ++-- .../online/cgform/model/OnlGenerateModel.java | 4 +- .../impl/OnlCgformFieldServiceImpl.java | 134 +++++++------ .../impl/OnlCgformHeadServiceImpl.java | 181 ++++++++---------- .../impl/OnlineBaseAPIServiceImpl.java | 8 +- .../service/impl/OnlineServiceImpl.java | 53 +++-- 6 files changed, 197 insertions(+), 219 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java index 7a8d8ed6..72af7a83 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java @@ -320,8 +320,8 @@ public class OnlComplexModel { } label200: { - List var21 = this.getColumns(); - List var22 = var2.getColumns(); + List var21 = this.getColumns(); + List var22 = var2.getColumns(); if (var21 == null) { if (var22 == null) { break label200; @@ -334,8 +334,8 @@ public class OnlComplexModel { } label193: { - List var23 = this.getHideColumns(); - List var24 = var2.getHideColumns(); + List var23 = this.getHideColumns(); + List var24 = var2.getHideColumns(); if (var23 == null) { if (var24 == null) { break label193; @@ -347,8 +347,8 @@ public class OnlComplexModel { return false; } - Map var25 = this.getDictOptions(); - Map var26 = var2.getDictOptions(); + Map> var25 = this.getDictOptions(); + Map> var26 = var2.getDictOptions(); if (var25 == null) { if (var26 != null) { return false; @@ -357,8 +357,8 @@ public class OnlComplexModel { return false; } - List var27 = this.getCgButtonList(); - List var28 = var2.getCgButtonList(); + List var27 = this.getCgButtonList(); + List var28 = var2.getCgButtonList(); if (var27 == null) { if (var28 != null) { return false; @@ -368,8 +368,8 @@ public class OnlComplexModel { } label172: { - List var29 = this.getFieldHrefSlots(); - List var30 = var2.getFieldHrefSlots(); + List var29 = this.getFieldHrefSlots(); + List var30 = var2.getFieldHrefSlots(); if (var29 == null) { if (var30 == null) { break label172; @@ -391,8 +391,8 @@ public class OnlComplexModel { return false; } - List var33 = this.getForeignKeys(); - List var34 = var2.getForeignKeys(); + List var33 = this.getForeignKeys(); + List var34 = var2.getForeignKeys(); if (var33 == null) { if (var34 != null) { return false; @@ -489,19 +489,19 @@ public class OnlComplexModel { var24 = var24 * 59 + (var10 == null ? 43 : var10.hashCode()); String var11 = this.getCheckboxFlag(); var24 = var24 * 59 + (var11 == null ? 43 : var11.hashCode()); - List var12 = this.getColumns(); + List var12 = this.getColumns(); var24 = var24 * 59 + (var12 == null ? 43 : var12.hashCode()); - List var13 = this.getHideColumns(); + List var13 = this.getHideColumns(); var24 = var24 * 59 + (var13 == null ? 43 : var13.hashCode()); - Map var14 = this.getDictOptions(); + Map> var14 = this.getDictOptions(); var24 = var24 * 59 + (var14 == null ? 43 : var14.hashCode()); - List var15 = this.getCgButtonList(); + List var15 = this.getCgButtonList(); var24 = var24 * 59 + (var15 == null ? 43 : var15.hashCode()); - List var16 = this.getFieldHrefSlots(); + List var16 = this.getFieldHrefSlots(); var24 = var24 * 59 + (var16 == null ? 43 : var16.hashCode()); String var17 = this.getEnhanceJs(); var24 = var24 * 59 + (var17 == null ? 43 : var17.hashCode()); - List var18 = this.getForeignKeys(); + List var18 = this.getForeignKeys(); var24 = var24 * 59 + (var18 == null ? 43 : var18.hashCode()); String var19 = this.getPidField(); var24 = var24 * 59 + (var19 == null ? 43 : var19.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java index 0e7fee95..6dd3d38a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlGenerateModel.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; public class OnlGenerateModel implements Serializable { - private static final long b = 684098897071177558L; + private static final long B = 684098897071177558L; private String code; private String projectPath; private String packageStyle; @@ -16,7 +16,7 @@ public class OnlGenerateModel implements Serializable { private String entityPackage; private String entityName; private String jspMode; - List subList = new ArrayList<>(); + private List subList = new ArrayList<>(); public String getProjectPath() { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index b6a67aa8..79e91252 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -106,9 +106,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl(var22, var20); + Page> var18 = new Page<>(var22, var20); log.debug("---Online查询sql:>>" + var9.toString()); - IPage var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString()); + IPage> var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString()); var5.put(TOTAL, var19.getTotal()); var5.put(RECORDS, CgformUtil.d(var19.getRecords())); } @@ -152,9 +152,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var25 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); if ("true".equals(params.get("hasQuery"))) { - ArrayList var19 = new ArrayList<>(); + ArrayList> var19 = new ArrayList<>(); Iterator var20 = ((List)var25).iterator(); while(true) { @@ -162,7 +162,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var23 = this.a(var22, tbname, headId, needList, pidField); if (var23 != null && var23.size() > 0 && !var19.contains(var23)) { var19.add(var23); } @@ -177,19 +177,19 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl>" + var10.toString()); - if (var25 != null && !((List)var25).isEmpty()) { - var6.put(TOTAL, ((List)var25).size()); + if (var25 != null && !(var25).isEmpty()) { + var6.put(TOTAL, (var25).size()); var6.put(FIELD_LIST, var9); - var6.put(RECORDS, CgformUtil.d((List)var25)); + var6.put(RECORDS, CgformUtil.d(var25)); } else { var6.put(TOTAL, 0); var6.put(FIELD_LIST, var9); } } else { Integer var26 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); - Page var27 = new Page<>(var26, var24); + Page> var27 = new Page<>(var26, var24); log.debug("---Online查询sql:>>" + var10.toString()); - IPage var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString()); + IPage> var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString()); var6.put(TOTAL, var28.getTotal()); var6.put(RECORDS, CgformUtil.d(var28.getRecords())); } @@ -209,16 +209,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var13 = this.onlAuthDataMapper.queryOwnerAuth(var12, var3); if (var13 != null && !var13.isEmpty()) { JeroDataAutorUtils.installUserInfo(this.sysBaseAPI.getCacheUser(var11.getUsername())); } String var14 = CgformUtil.a(var8, var6, var4, var13); - var10.append(WHERE_1 + var14 + "and id='" + var1 + "'"); - List var15 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); + var10.append(WHERE_1).append(var14).append("and id='").append(var1).append("'"); + List> var15 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); if (var15 != null && !var15.isEmpty()) { - Map var16 = (Map)var15.get(0); + Map var16 = var15.get(0); return var16 != null && var16.get(var5) != null && !"0".equals(var16.get(var5)) ? this.a(var16.get(var5).toString(), var2, var3, var4, var5) : var16; } else { return Collections.emptyMap(); @@ -229,7 +229,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, code); - List var6 = this.list(var5); + List var6 = this.list(var5); if (isCrazy) { this.baseMapper.executeInsertSQL(CgformUtil.c(tbname, var6, json)); } else { @@ -240,9 +240,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var6 = new LambdaQueryWrapper(); + LambdaQueryWrapper var6 = new LambdaQueryWrapper<>(); var6.eq(OnlCgformField::getCgformHeadId, code); - List var7 = this.list(var6); + List var7 = this.list(var6); Iterator var8 = var7.iterator(); while(true) { @@ -257,7 +257,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var10 = CgformUtil.a(tbname, var7, json); this.baseMapper.executeInsertSQL(var10); if (!"0".equals(json.getString(pidField))) { this.baseMapper.editFormData(UPDATE + tbname + SET + hasChildField + " = '1' where id = '" + json.getString(pidField) + "'"); @@ -269,7 +269,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl fieldList, String tbname, JSONObject json) { - Map var4 = CgformUtil.a(tbname, fieldList, json); + Map var4 = CgformUtil.a(tbname, fieldList, json); this.baseMapper.executeInsertSQL(var4); } @@ -277,7 +277,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, code); - List var6 = this.list(var5); + List var6 = this.list(var5); if (isCrazy) { this.baseMapper.executeUpdatetSQL(CgformUtil.d(tbname, var6, json)); } else { @@ -290,12 +290,12 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var8 = this.baseMapper.queryFormData(var7); + Map var9 = CgformUtil.b(var8); String var10 = var9.get(pidField).toString(); - LambdaQueryWrapper var11 = new LambdaQueryWrapper(); + LambdaQueryWrapper var11 = new LambdaQueryWrapper<>(); var11.eq(OnlCgformField::getCgformHeadId, code); - List var12 = this.list(var11); + List var12 = this.list(var11); Iterator var13 = var12.iterator(); while(var13.hasNext()) { @@ -306,7 +306,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var16 = CgformUtil.b(tbname, var12, json); this.baseMapper.executeUpdatetSQL(var16); if (!var10.equals(json.getString(pidField))) { if (!"0".equals(var10)) { @@ -325,10 +325,10 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryFormData(String code, String tbname, String id) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformField::getCgformHeadId, code); var4.eq(OnlCgformField::getIsShowForm, 1); - List var5 = this.list(var4); + List var5 = this.list(var4); String var6 = CgformUtil.a(tbname, var5, id); return this.onlCgformFieldMapper.queryFormData(var6); } @@ -344,7 +344,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var9 = new ArrayList(); + ArrayList> var9 = new ArrayList<>(); if (oConvertUtils.isNotEmpty(head.getSubTableStr())) { String[] var10 = head.getSubTableStr().split(","); int var11 = var10.length; @@ -356,9 +356,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl fieldQueryWrapper = new LambdaQueryWrapper<>(); fieldQueryWrapper.eq(OnlCgformField::getCgformHeadId, var14.getId()).eq(OnlCgformField::getMainTable, head.getTableName()); - List list = this.list(fieldQueryWrapper); + List list = this.list(fieldQueryWrapper); if (list != null && !list.isEmpty()) { - OnlCgformField onlCgformField = (OnlCgformField)list.get(0); + OnlCgformField onlCgformField = list.get(0); HashMap var18 = new HashMap<>(); var18.put(var6, onlCgformField.getDbFieldName()); var18.put(var8, onlCgformField.getMainField()); @@ -369,9 +369,9 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl headIdQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper headIdQueryWrapper = new LambdaQueryWrapper<>(); headIdQueryWrapper.eq(OnlCgformField::getCgformHeadId, var3); - List var25 = this.list(headIdQueryWrapper); + List var25 = this.list(headIdQueryWrapper); String[] var26 = ids.split(","); String[] var27 = var26; int var29 = var26.length; @@ -394,8 +394,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var34 = this.onlCgformFieldMapper.queryFormData(var33); + new ArrayList<>(); Iterator var20 = var9.iterator(); while(var20.hasNext()) { @@ -436,7 +436,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> getAutoListQueryInfo(String code) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformField::getCgformHeadId, code); var2.eq(OnlCgformField::getIsQuery, 1); var2.orderByAsc(OnlCgformField::getOrderNum); - List var3 = this.list(var2); - ArrayList var4 = new ArrayList(); + List var3 = this.list(var2); + ArrayList var4 = new ArrayList<>(); int var5 = 0; HashMap var8; @@ -515,7 +515,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryFormFields(String code, boolean isform) { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformField::getCgformHeadId, code); if (isform) { var3.eq(OnlCgformField::getIsShowForm, 1); @@ -532,7 +532,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var6 = this.list(var5); LoginUser var8 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var9 = var8.getId(); - ArrayList var10 = new ArrayList(); - List var11; + ArrayList var10 = new ArrayList<>(); + List var11; if (oConvertUtils.isEmpty(taskId)) { var11 = this.onlAuthPageService.queryHideCode(var9, cgFormId, isList); if (var11 != null && !var11.isEmpty() && var11.get(0) != null) { @@ -608,10 +608,10 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl(); + ArrayList var14 = new ArrayList<>(); for(int var12 = 0; var12 < var6.size(); ++var12) { - OnlCgformField var13 = (OnlCgformField)var6.get(var12); + OnlCgformField var13 = var6.get(var12); if (this.b(var13.getDbFieldName(), var10)) { var14.add(var13); } @@ -626,23 +626,23 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var5 = this.baseMapper.selectOnlineDisabledColumns(var4, var2); return this.a(var5); } @Override public List queryDisabledFields(String tbname, String taskId) { if (oConvertUtils.isEmpty(taskId)) { - return null; + return Collections.emptyList(); } else { - List var3 = ((OnlCgformFieldMapper)this.baseMapper).selectFlowAuthColumns(tbname, taskId, "2"); + List var3 = this.baseMapper.selectFlowAuthColumns(tbname, taskId, "2"); return this.a(var3); } } private List a(List var1) { - ArrayList var2 = new ArrayList(); - if (var1 != null && var1.size() != 0 && var1.get(0) != null) { + ArrayList var2 = new ArrayList<>(); + if (var1 != null && !var1.isEmpty() && var1.get(0) != null) { Iterator var3 = var1.iterator(); while(var3.hasNext()) { @@ -666,7 +666,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var8 = this.baseMapper.selectOnlineHideColumns(var7, var5); return this.a(var8, isList, List, needList); } @@ -674,14 +674,14 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAvailableFields(String cgformId, String tbname, boolean isList, List List, List needList) { LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var7 = var6.getId(); - List var8 = this.onlAuthPageService.queryListHideColumn(var7, cgformId); + List var8 = this.onlAuthPageService.queryListHideColumn(var7, cgformId); return this.a(var8, isList, List, needList); } private List a(List var1, boolean var2, List var3, List var4) { - ArrayList var5 = new ArrayList(); + ArrayList var5 = new ArrayList<>(); boolean var6 = true; - if (var1 == null || var1.size() == 0 || var1.get(0) == null) { + if (var1 == null || var1.isEmpty() || var1.get(0) == null) { var6 = false; } @@ -724,7 +724,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var2) { boolean var3 = false; - Iterator var4 = var2.iterator(); - while(var4.hasNext()) { - OnlCgformField var5 = (OnlCgformField)var4.next(); + for (OnlCgformField var5 : var2) { if (oConvertUtils.camelToUnderline(var1).equals(var5.getDbFieldName())) { var3 = true; break; @@ -753,23 +751,23 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl params) { - ((OnlCgformFieldMapper)this.baseMapper).executeInsertSQL(params); + this.baseMapper.executeInsertSQL(params); } @Override public void executeUpdatetSQL(Map params) { - ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(params); + this.baseMapper.executeUpdatetSQL(params); } @Override public List queryDataListByLinkDown(LinkDown linkDown) { - return ((OnlCgformFieldMapper)this.baseMapper).queryDataListByLinkDown(linkDown); + return this.baseMapper.queryDataListByLinkDown(linkDown); } @Override public void updateTreeNodeNoChild(String tableName, String filed, String id) { - Map var4 = CgformUtil.a(tableName, filed, id); - ((OnlCgformFieldMapper)this.baseMapper).executeUpdatetSQL(var4); + Map var4 = CgformUtil.a(tableName, filed, id); + this.baseMapper.executeUpdatetSQL(var4); } @Override @@ -810,12 +808,12 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var13 = this.baseMapper.queryFormData(var12); + Map var14 = CgformUtil.b(var13); String var15 = var14.get(var3).toString(); String var16 = SELECT_FROM + CgformUtil.f(var4) + WHERE + var3 + "= '" + var15 + "' and id not in(" + ids + ")"; List> var17 = this.onlCgformFieldMapper.queryListBySql(var16); - if ((var17 == null || var17.size() == 0) && !Arrays.asList(var6).contains(var15) && !var5.toString().contains(var15)) { + if ((var17 == null || var17.isEmpty()) && !Arrays.asList(var6).contains(var15) && !var5.toString().contains(var15)) { var5.append(var15).append(","); } } @@ -826,8 +824,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var6 = this.onlCgformFieldMapper.queryListBySql(var5); + Map var9; if (var6 != null && !var6.isEmpty()) { for(Iterator var7 = var6.iterator(); var7.hasNext(); this.a(var9.get("id").toString(), var2, var3, var4)) { Map var8 = (Map)var7.next(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index 430b2fbd..652b2294 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -237,7 +237,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl cgformIndexCopy.getId().equals(var1.getId())); + boolean var26 = var7.stream().anyMatch(var1 -> cgformIndexCopy.getId().equals(var1.getId())); if (!var26) { var15.setDelFlag(CommonConstant.DEL_FLAG_1); var24.add(var15); @@ -594,11 +594,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { if (var1.getTableType() == 3) { var1 = this.baseMapper.selectById(var1.getId()); @@ -676,7 +680,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().like(OnlCgformHead::getSubTableStr, var1.getTableName())); + List var12 = this.baseMapper.selectList(new LambdaQueryWrapper().like(OnlCgformHead::getSubTableStr, var1.getTableName())); if (var12 != null && !var12.isEmpty()) { for (Object o : var12) { @@ -688,7 +692,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var12)); if (var14 != null) { - List var15 = this.fieldService.list((new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); + List var15 = this.fieldService.list((new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); String var16 = ""; String var17 = null; @@ -799,26 +803,24 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.fieldService.queryFormFields(var4.getId(), false); String var6 = null; - Iterator var7 = var5.iterator(); - while(var7.hasNext()) { - OnlCgformField var8 = (OnlCgformField)var7.next(); + for (OnlCgformField var8 : var5) { if (oConvertUtils.isNotEmpty(var8.getMainField())) { var6 = var8.getDbFieldName(); break; } } - List var9 = this.fieldService.querySubFormData(var5, table, var6, mainId); + List> var9 = this.fieldService.querySubFormData(var5, table, var6, mainId); if (var9 != null && var9.isEmpty()) { throw new DBException(DB_SUB_ID + table + "]未找到相关信息,主表ID为" + mainId); } else if (var9 != null && var9.size() > 1) { throw new DBException(DB_SUB_ID + table + "]存在多条记录,主表ID为" + mainId); } else { if(!CollectionUtils.isEmpty(var9)){ - return (Map)var9.get(0); + return var9.get(0); }else{ return Collections.emptyMap(); } @@ -832,7 +834,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4 = this.fieldService.queryFormFields(var3.getId(), false); String var5 = null; String var6 = null; String var7 = null; @@ -849,24 +851,23 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var16 = new ArrayList<>(); var9 = new OnlCgformField(); var9.setDbFieldName(var7); var16.add(var9); - Map var10 = this.fieldService.queryFormData(var16, var6, mainId); + Map var10 = this.fieldService.queryFormData(var16, var6, mainId); String var11 = oConvertUtils.getString(oConvertUtils.getString(var10.get(var7)),Objects.isNull(var7) ? "" : oConvertUtils.getString(var10.get(var7.toUpperCase()))); - List var12 = this.fieldService.querySubFormData(var4, table, var5, var11); + List> var12 = this.fieldService.querySubFormData(var4, table, var5, var11); if (var12 != null && var12.isEmpty()) { throw new DBException(DB_SUB_ID + table + "]未找到相关信息,主表ID为" + mainId); } else { if(CollectionUtils.isEmpty(var12)){ - var12 = new ArrayList(); + var12 = new ArrayList<>(); } - ArrayList var13 = new ArrayList(var12.size()); - Iterator var14 = var12.iterator(); + ArrayList> var13 = new ArrayList(var12.size()); - while(var14.hasNext()) { - Map var15 = (Map)var14.next(); + for (Map stringObjectMap : var12) { + Map var15 = stringObjectMap; var13.add(CgformUtil.b(var15)); } @@ -881,8 +882,8 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4 = this.fieldService.queryFormFields(code, true); + Map var5 = this.fieldService.queryFormData(var4, var3.getTableName(), id); if (var3.getTableType() == 2) { String var6 = var3.getSubTableStr(); if (oConvertUtils.isNotEmpty(var6)) { @@ -894,13 +895,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { - List var13 = this.fieldService.queryFormFields(var12.getId(), false); + List var13 = this.fieldService.queryFormFields(var12.getId(), false); String var14 = ""; String var15 = null; - Iterator var16 = var13.iterator(); - while(var16.hasNext()) { - OnlCgformField var17 = (OnlCgformField)var16.next(); + for (OnlCgformField var17 : var13) { if (!oConvertUtils.isEmpty(var17.getMainField())) { var14 = var17.getDbFieldName(); String var18 = var17.getMainField(); @@ -912,7 +911,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl> var19 = this.fieldService.querySubFormData(var13, var11, var14, var15); if (var19 != null && !var19.isEmpty()) { var5.put(var11, CgformUtil.d(var19)); } else { @@ -956,13 +955,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { - List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); + List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); String var14 = ""; String var15 = null; - Iterator var16 = var13.iterator(); - while(var16.hasNext()) { - OnlCgformField var17 = (OnlCgformField)var16.next(); + for (OnlCgformField var17 : var13) { if (!oConvertUtils.isEmpty(var17.getMainField())) { var14 = var17.getDbFieldName(); String var18 = var17.getMainField(); @@ -1003,14 +1000,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = new LambdaQueryWrapper(); + LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformEnhanceJava::getActiveStatus, "1"); var5.eq(OnlCgformEnhanceJava::getButtonCode, buttonCode); var5.eq(OnlCgformEnhanceJava::getCgformHeadId, head.getId()); var5.eq(OnlCgformEnhanceJava::getEvent, eventType); OnlCgformEnhanceJava var6 = this.onlCgformEnhanceJavaMapper.selectOne(var5); Object var7 = this.a(var6); - if (var7 != null && var7 instanceof CgformEnhanceJavaInter) { + if (var7 instanceof CgformEnhanceJavaInter) { CgformEnhanceJavaInter var8 = (CgformEnhanceJavaInter)var7; return var8.execute(head.getTableName(), json); } else { @@ -1029,10 +1026,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.onlCgformEnhanceJavaMapper.selectList(var4); if (var5 != null && !var5.isEmpty()) { - Object var6 = this.a((OnlCgformEnhanceJava)var5.get(0)); - if (var6 != null && var6 instanceof CgformEnhanceJavaListInter) { + Object var6 = this.a(var5.get(0)); + if (var6 instanceof CgformEnhanceJavaListInter) { CgformEnhanceJavaListInter var7 = (CgformEnhanceJavaListInter)var6; var7.execute(head.getTableName(), dataList); } @@ -1067,7 +1064,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformEnhanceSql::getButtonCode, buttonCode); var4.eq(OnlCgformEnhanceSql::getCgformHeadId, formId); OnlCgformEnhanceSql var5 = this.onlCgformEnhanceSqlMapper.selectOne(var4); @@ -1094,7 +1091,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.baseMapper.queryOneByTableNameAndId(CgformUtil.f(var4.getTableName()), dataId); JSONObject var6 = JSON.parseObject(JSON.toJSONString(var5)); this.executeEnhanceJava(buttonCode, START, var4, var6); this.executeEnhanceSql(buttonCode, formId, var6); @@ -1104,7 +1101,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl queryValidButtonList(String headId) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformButton::getCgformHeadId, headId); var2.eq(OnlCgformButton::getButtonStatus, "1"); var2.orderByAsc(OnlCgformButton::getOrderNum); @@ -1113,7 +1110,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformEnhanceJs::getCgformHeadId, formId); var3.eq(OnlCgformEnhanceJs::getCgJsType, cgJsType); return this.onlCgformEnhanceJsMapper.selectOne(var3); @@ -1129,11 +1126,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.baseMapper.queryOneByTableNameAndId(var4, dataId); if (var5 == null) { throw new BusinessException("未找到数据信息"); } else { - Map var6 = CgformUtil.b(var5); + Map var6 = CgformUtil.b(var5); String var7 = "delete"; JSONObject var8 = JSON.parseObject(JSON.toJSONString(var6)); this.executeEnhanceJava(var7, START, var3, var8); @@ -1153,9 +1150,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2 = this.fieldService.queryAvailableFields(head.getId(), head.getTableName(), head.getTaskId(), false); + ArrayList var3 = new ArrayList<>(); + List var4; if (oConvertUtils.isEmpty(head.getTaskId())) { var4 = this.onlAuthPageService.queryFormDisabledCode(head.getId()); if (var4 != null && !var4.isEmpty() && var4.get(0) != null) { @@ -1179,9 +1176,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var9)); if (var10 != null) { - List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); - new ArrayList(); - List var12; + List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); + new ArrayList<>(); + List var12; if (oConvertUtils.isNotEmpty(head.getTaskId())) { var12 = this.fieldService.queryDisabledFields(var10.getTableName(), head.getTaskId()); } else { @@ -1218,11 +1215,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var3 = new ArrayList<>(); + ArrayList var4 = new ArrayList<>(); this.a(model.getCode(), var3, var4); OnlCgformHead onlCgformHead = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getId, model.getCode())); - HashMap hashMap = new HashMap(); + HashMap hashMap = new HashMap<>(); hashMap.put("scroll", onlCgformHead.getScroll() == null ? "0" : onlCgformHead.getScroll().toString()); String var7 = onlCgformHead.getFormTemplate(); if (oConvertUtils.isEmpty(var7)) { @@ -1257,15 +1254,13 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = new ArrayList<>(); + ArrayList var6 = new ArrayList<>(); this.a(model.getCode(), var5, var6); - List var7 = model.getSubList(); - ArrayList var8 = new ArrayList(); - Iterator var9 = var7.iterator(); + List var7 = model.getSubList(); + ArrayList var8 = new ArrayList<>(); - while(var9.hasNext()) { - OnlGenerateModel var10 = (OnlGenerateModel)var9.next(); + for (OnlGenerateModel var10 : var7) { OnlCgformHead var11 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var10.getTableName())); if (var11 != null) { SubTableVo var12 = new SubTableVo(); @@ -1275,8 +1270,8 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var14 = new ArrayList<>(); + ArrayList var15 = new ArrayList<>(); OnlCgformField var16 = this.a(var11.getId(), var14, var15); if (var16 != null) { var12.setOriginalForeignKeys(new String[]{var16.getDbFieldName()}); @@ -1293,10 +1288,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2, List var3) { - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformField::getCgformHeadId, var1); var4.orderByAsc(OnlCgformField::getOrderNum); - List var5 = this.fieldService.list(var4); + List var5 = this.fieldService.list(var4); OnlCgformField var6 = null; Iterator var7 = var5.iterator(); @@ -1451,13 +1446,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var9)); if (var10 != null) { - List var11 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var10.getId())); + List var11 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var10.getId())); String var12 = ""; String var13 = null; - Iterator var14 = var11.iterator(); - while(var14.hasNext()) { - OnlCgformField var15 = (OnlCgformField)var14.next(); + for (OnlCgformField var15 : var11) { if (!oConvertUtils.isEmpty(var15.getMainField())) { var12 = var15.getDbFieldName(); String var16 = var15.getMainField(); @@ -1529,11 +1522,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformField::getCgformHeadId, var2)); - Iterator var6 = var5.iterator(); + List var5 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var2)); - while(var6.hasNext()) { - OnlCgformField var7 = (OnlCgformField)var6.next(); + for (OnlCgformField var7 : var5) { OnlCgformField var8 = new OnlCgformField(); var8.setCgformHeadId(var4); this.a(var7, var8); @@ -1545,11 +1536,9 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl headList) { - List var2 = this.baseMapper.queryCopyPhysicId(); - Iterator var3 = headList.iterator(); + List var2 = this.baseMapper.queryCopyPhysicId(); - while(var3.hasNext()) { - OnlCgformHead var4 = (OnlCgformHead)var3.next(); + for (OnlCgformHead var4 : headList) { if (var2.contains(var4.getId())) { var4.setHascopy(1); } else { @@ -1588,7 +1577,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.baseMapper.queryOneByTableNameAndId(var3, dataId); String var6 = null; if (var5.get(var4) != null && !"0".equals(var5.get(var4))) { var6 = var5.get(var4).toString(); @@ -1608,14 +1597,14 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { - List var3 = this.list(new LambdaQueryWrapper().eq(OnlCgformHead::getPhysicId, var1.getId())); + List var3 = this.list(new LambdaQueryWrapper().eq(OnlCgformHead::getPhysicId, var1.getId())); if (var3 != null && !var3.isEmpty()) { Iterator var4 = var3.iterator(); while(true) { - List var6; + List var6; String var13; - ArrayList var19; + ArrayList var19; Iterator var22; label108: do { @@ -1624,28 +1613,24 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformField::getCgformHeadId, var5.getId())); OnlCgformField var9; if (var6 != null && !var6.isEmpty()) { - HashMap var15 = new HashMap(); - Iterator var16 = var6.iterator(); + HashMap var15 = new HashMap<>(); - while(var16.hasNext()) { - var9 = (OnlCgformField)var16.next(); + for (Object value : var6) { + var9 = (OnlCgformField) value; var15.put(var9.getDbFieldName(), 1); } - HashMap var17 = new HashMap(); - Iterator var18 = var2.iterator(); + HashMap var17 = new HashMap<>(); - while(var18.hasNext()) { - OnlCgformField var10 = (OnlCgformField)var18.next(); + for (OnlCgformField var10 : var2) { var17.put(var10.getDbFieldName(), 1); } - var19 = new ArrayList(); - ArrayList var20 = new ArrayList(); - Iterator var11 = var17.keySet().iterator(); + var19 = new ArrayList<>(); + ArrayList var20 = new ArrayList<>(); - while(var11.hasNext()) { - String var12 = (String)var11.next(); + for (Object o : var17.keySet()) { + String var12 = (String) o; if (var15.get(var12) == null) { var20.add(var12); } else { @@ -1653,7 +1638,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl(); + ArrayList var21 = new ArrayList<>(); var22 = var15.keySet().iterator(); while(var22.hasNext()) { @@ -1807,11 +1792,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var3 = this.baseMapper.queryAllCopyTableName(var1); int var4 = 0; if (!CollectionUtils.isEmpty(var3)) { for(int var5 = 0; var5 < var3.size(); ++var5) { - String var6 = (String)var3.get(var5); + String var6 = var3.get(var5); int var7 = Integer.parseInt(var6.split("\\$")[1]); if (var7 > var4) { var4 = var7; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java index 80f5af3a..0354de03 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java @@ -25,20 +25,18 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { String var3 = code.substring(1); OnlCgformHead var4 = this.onlCgformHeadMapper.selectById(var3); if (var4 != null && var4.getTableType() == 3) { - List var6 = this.onlCgformFieldMapper.selectList(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var3)); + List var6 = this.onlCgformFieldMapper.selectList(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var3)); if (var6 != null && !var6.isEmpty()) { String var7 = null; - Iterator var8 = var6.iterator(); - while(var8.hasNext()) { - OnlCgformField var9 = (OnlCgformField)var8.next(); + for (OnlCgformField var9 : var6) { if (oConvertUtils.isNotEmpty(var9.getMainTable())) { var7 = var9.getMainTable(); break; } } - LambdaQueryWrapper var10 = new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var7); + LambdaQueryWrapper var10 = new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var7); OnlCgformHead var11 = this.onlCgformHeadMapper.selectOne(var10); if (var11 != null && "erp".equals(var11.getThemeTemplate())) { code = "/" + var11.getId(); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java index 5e4c1b28..379ca0e7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; @@ -47,13 +48,13 @@ public class OnlineServiceImpl implements IOnlineService { public OnlComplexModel queryOnlineConfig(OnlCgformHead head) { String var2 = head.getId(); - List var3 = this.a(var2); - List var4 = this.onlAuthPageService.queryHideCode(var2, true); - ArrayList var5 = new ArrayList(); - HashMap var6 = new HashMap(); - ArrayList var7 = new ArrayList(); - ArrayList var8 = new ArrayList(); - ArrayList var9 = new ArrayList(); + List var3 = this.a(var2); + List var4 = this.onlAuthPageService.queryHideCode(var2, true); + ArrayList var5 = new ArrayList<>(); + HashMap var6 = new HashMap<>(); + ArrayList var7 = new ArrayList<>(); + ArrayList var8 = new ArrayList<>(); + ArrayList var9 = new ArrayList<>(); Iterator var10 = var3.iterator(); String var14; @@ -72,7 +73,7 @@ public class OnlineServiceImpl implements IOnlineService { String var16 = var11.getDictField(); String var17 = var11.getFieldShowType(); if (oConvertUtils.isNotEmpty(var16) && !"popup".equals(var17)) { - Object var18 = new ArrayList(); + Object var18 = new ArrayList<>(); if (oConvertUtils.isNotEmpty(var11.getDictTable())) { var18 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var11.getDictText(), var16); } else if (oConvertUtils.isNotEmpty(var11.getDictField())) { @@ -83,14 +84,14 @@ public class OnlineServiceImpl implements IOnlineService { var28.setCustomRender(var12); } - List var29; + List var29; if ("switch".equals(var17)) { var29 = CgformUtil.a(var11); var6.put(var12, var29); var28.setCustomRender(var12); } - List var20; + List var20; String var31; if ("link_down".equals(var17)) { var31 = var11.getDictTable(); @@ -105,7 +106,7 @@ public class OnlineServiceImpl implements IOnlineService { if ("sel_tree".equals(var17)) { String[] var33 = var11.getDictText().split(","); - List var30 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var33[2], var33[0]); + List var30 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var33[2], var33[0]); var6.put(var12, var30); var28.setCustomRender(var12); } @@ -134,11 +135,11 @@ public class OnlineServiceImpl implements IOnlineService { var28.setCustomRender(var12); } - if (var17.indexOf("file") >= 0) { + if (var17.contains("file")) { var28.setScopedSlots(new ScopedSlots("fileSlot")); - } else if (var17.indexOf("image") >= 0) { + } else if (var17.contains("image")) { var28.setScopedSlots(new ScopedSlots("imgSlot")); - } else if (var17.indexOf("editor") >= 0) { + } else if (var17.contains("editor")) { var28.setScopedSlots(new ScopedSlots("htmlSlot")); } else if (var17.equals("date")) { var28.setScopedSlots(new ScopedSlots("dateSlot")); @@ -157,7 +158,7 @@ public class OnlineServiceImpl implements IOnlineService { } String showLength = "showLength"; var31 = var11.getFieldExtendJson(); - if (oConvertUtils.isNotEmpty(var31) && var31.indexOf(showLength) > -1) { + if (oConvertUtils.isNotEmpty(var31) && var31.contains(showLength)) { JSONObject var34 = JSON.parseObject(var31); if (var34 != null && var34.get(showLength) != null) { var28.setShowLength(oConvertUtils.getInt(var34.get(showLength))); @@ -185,12 +186,10 @@ public class OnlineServiceImpl implements IOnlineService { var22.setFieldHrefSlots(var7); var22.setForeignKeys(var8); var22.setHideColumns(var4); - List var23 = this.onlCgformHeadService.queryButtonList(var2, true); - ArrayList var24 = new ArrayList(); - Iterator var25 = var23.iterator(); + List var23 = this.onlCgformHeadService.queryButtonList(var2, true); + ArrayList var24 = new ArrayList<>(); - while(var25.hasNext()) { - OnlCgformButton var27 = (OnlCgformButton)var25.next(); + for (OnlCgformButton var27 : var23) { if (!var4.contains(var27.getButtonCode())) { var24.add(var27); } @@ -220,10 +219,8 @@ public class OnlineServiceImpl implements IOnlineService { for(int var9 = 0; var9 < var8; ++var9) { String var10 = var7[var9]; - Iterator var11 = var1.iterator(); - while(var11.hasNext()) { - OnlCgformField var12 = (OnlCgformField)var11.next(); + for (OnlCgformField var12 : var1) { String var13 = var12.getDbFieldName(); if (1 == var12.getIsShowList() && var10.equals(var13)) { var2.add(var10); @@ -241,8 +238,8 @@ public class OnlineServiceImpl implements IOnlineService { public JSONObject queryOnlineFormObj(OnlCgformHead head, OnlCgformEnhanceJs onlCgformEnhanceJs) { JSONObject var3 = new JSONObject(); String var4 = head.getId(); - List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), null, false); - List var6 = this.onlAuthPageService.queryFormDisabledCode(var4); + List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), null, false); + List var6 = this.onlAuthPageService.queryFormDisabledCode(var4); EnhanceJsUtil.a(onlCgformEnhanceJs, head.getTableName(), var5); TreeSelectColumn var7 = null; if ("Y".equals(head.getIsTree())) { @@ -261,7 +258,7 @@ public class OnlineServiceImpl implements IOnlineService { var8.put("describe", head.getTableTxt()); var3.put("schema", var8); var3.put("head", head); - List var9 = this.queryFormValidButton(var4); + List var9 = this.queryFormValidButton(var4); if (var9 != null && !var9.isEmpty()) { var3.put("cgButtonList", var9); } @@ -282,11 +279,11 @@ public class OnlineServiceImpl implements IOnlineService { public List queryFormValidButton(String headId) { List var2 = this.onlCgformHeadService.queryButtonList(headId, false); - List var3 = null; + List var3 = null; if (var2 != null && !var2.isEmpty()) { LoginUser var4 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var5 = var4.getId(); - List var6 = this.onlAuthPageService.queryFormHideButton(var5, headId); + List var6 = this.onlAuthPageService.queryFormHideButton(var5, headId); var3 = var2.stream().filter(var1 -> var6 == null || !var6.contains(var1.getButtonCode())).collect(Collectors.toList()); }