fix

src/main/java/com/goer/project/model/modelEntity/controller/ModelEntityController.java

@@ -216,27 +216,27 @@ public class ModelEntityController extends BaseController
         ModelDbs modelDbs = new ModelDbs();
         modelDbs.setProjectId(projectId);
         List<ModelDbs> list = modelDbsService.selectModelDbsList(modelDbs);
-        for (Iterator<ModelDbs> iterator = list.listIterator(); iterator.hasNext();) {
-            ModelDbs next = iterator.next();
-            if("Y".equalsIgnoreCase(next.getDefaultDb())) {
-                modelDbs = next;
-                iterator.remove();
-                break;
-            }
-        }
-        list.sort(Comparator.comparing(ModelDbs::getId));
-        list.add(0, modelDbs);
+//        for (Iterator<ModelDbs> iterator = list.listIterator(); iterator.hasNext();) {
+//            ModelDbs next = iterator.next();
+//            if("Y".equalsIgnoreCase(next.getDefaultDb())) {
+//                modelDbs = next;
+//                iterator.remove();
+//                break;
+//            }
+//        }
+//        list.sort(Comparator.comparing(ModelDbs::getId));
+//        list.add(0, modelDbs);
 
-//        Collections.sort(list,new Comparator<ModelDbs>(){
-//                @Override
-//                public int compare(ModelDbs m1,ModelDbs m2){
-//                        int i = m1.getDefaultDb().compareTo(m2.getDefaultDb());
-//                        if(i != 0) {
-//                            return i;
-//                        }
-//                        return Long.compare(m1.getId(), m2.getId().longValue());
-//                    }
-//        });
+        Collections.sort(list,new Comparator<ModelDbs>(){
+                @Override
+                public int compare(ModelDbs m1,ModelDbs m2){
+                        int i = m2.getDefaultDb().compareTo(m1.getDefaultDb());
+                        if(i != 0) {
+                            return i;
+                        }
+                        return Long.compare(m1.getId(), m2.getId().longValue());
+                    }
+        });
         mmap.put("projectId", projectId);
         mmap.put("modelDbs", list);
 

src/main/resources/templates/model/dataType/dataType.html

@@ -189,7 +189,7 @@
                 success: function(result) {
                     if (result.code == web_status.SUCCESS) {
                         $.table.search();
-                        $.modal.alertSuccess(result.msg)
+                        $.modal.msgSuccess(result.msg)
                     } else if (result.code == web_status.WARNING) {
                         $.modal.alertWarning(result.msg)
                     } else {

src/main/resources/templates/model/modelEntity/modelEntity.html

@@ -91,6 +91,7 @@
                 showRefresh: true,
                 showToggle: true,
                 showColumns: true,
+                uniqueId: "id",
                 sortName: "entitySort",
                 sortOrder: "asc",
                 onReorderRow: function (data) {
@@ -156,13 +157,9 @@
 
         /** 字段列表 */
         function modelField(projectId, entityId) {
+            var data = $("#bootstrap-table").bootstrapTable('getRowByUniqueId', entityId);
             var url = ctx + "model/modelField?projectId=" + projectId + "&entityId=" + entityId + "&versionId=0";
-            $.modal.openTab("字段一览", url);
-        }
-
-        function dbReverse() {
-            var url = ctx + "model/modelField?projectId=" + projectId + "&entityId=" + entityId + "&versionId=0";
-            $.modal.openTab("从数据库导入", url);
+            $.modal.openTab(data.entityCode+"["+data.entityName+"]", url);
         }
 
         // 从数据库导入
@@ -219,7 +216,7 @@
                 success: function(result) {
                     if (result.code == web_status.SUCCESS) {
                         $.table.search();
-                        $.modal.alertSuccess(result.msg)
+                        $.modal.msgSuccess(result.msg)
                     } else if (result.code == web_status.WARNING) {
                         $.modal.alertWarning(result.msg)
                     } else {

src/main/resources/templates/model/modelField/modelField.html

@@ -233,7 +233,7 @@
                 success: function(result) {
                     if (result.code == web_status.SUCCESS) {
                         $.table.search();
-                        $.modal.alertSuccess(result.msg)
+                        $.modal.msgSuccess(result.msg)
                     } else if (result.code == web_status.WARNING) {
                         $.modal.alertWarning(result.msg)
                     } else {