排序

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -743,6 +743,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     " join m_wbs_tree_contract c on c.parent_id = k.id " +
                                     "where  c.contract_id=" + currentNode.getContractId() + " and c.is_deleted=0 "
                     );
+                    // 对查询的表单进行排序 优先以树节点，表单名称，数字，顺序
+
+
+
+
                     if (Func.isNotEmpty(tableNamePkIdsMaps)) {
                         // removeList.clear();
                         missingList.forEach(miss -> {
@@ -6967,7 +6972,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 return R.fail("表单不存在");
             }
             if (wbsTreeContract1.getIsCopeTab()!=null&&wbsTreeContract1.getIsCopeTab().equals(Integer.valueOf(2))) {
-                return R.fail("该表不能评定汇总");
+                return R.fail("该表不能");
             }
             try {
                 String biaodan = "SELECT id from " + wbsTreeContract1.getInitTableName() + " where p_key_id=" + wbsTreeContract1.getPKeyId();