Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

ViewModel/Configuration/LevelConfigVM.cs

@@ -90,17 +90,17 @@ public class LevelConfigVM : BaseViewModel
     }
     private string setInstitutes(string id)
     {
-        string insituteSql = @"SELECT * FROM RULE;";
+        string insituteSql = $"SELECT * FROM RULE;";
         Institutes = DataBaseHelper.ExecuteQuery(insituteSql);
         return Institutes.AsEnumerable().FirstOrDefault()["RULE_ID"].ToString();
     }
 
-    private void setDataGrid(string shapeId, string instituteId)
+    private void setDataGrid(string shapeId, string ruleId)
     {
-        string gradeSql = $"SELECT * FROM GRADE WHERE SHAPE_ID = '{shapeId}' AND RULE_ID = '{instituteId}' ORDER BY GRADE_ORDER;";
+        string gradeSql = $"SELECT * FROM GRADE WHERE SHAPE_ID = '{shapeId}' AND RULE_ID = '{ruleId}' ORDER BY GRADE_ORDER;";
         DataTable columnInfos = DataBaseHelper.ExecuteQuery(gradeSql);
 
-        string standardSql = $"SELECT * FROM STANDARD WHERE SHAPE_ID = '{shapeId}' AND RULE_ID = '{instituteId}' ORDER BY SUBSTR(0 || SORT, - 2), GRADE_ORDER;";
+        string standardSql = $"SELECT * FROM STANDARD WHERE SHAPE_ID = '{shapeId}' AND RULE_ID = '{ruleId}' ORDER BY SUBSTR(0 || SORT, - 2), GRADE_ORDER;";
         DataTable rowInfos = DataBaseHelper.ExecuteQuery(standardSql);
         setStandardList(columnInfos, rowInfos);
     }
@@ -315,15 +315,13 @@ public class LevelConfigVM : BaseViewModel
                     string shapeInsertSql = $"INSERT INTO SHAPE (SHAPE_ID,SHAPE_NAME,SHAPE_EN_NAME,GUID)VALUES('{shapeId}','{jsonEntity.SHAPE_NAME}','{jsonEntity.SHAPE_EN_NAME}','{Guid.NewGuid().ToString()}');";
                     DataBaseHelper.ExecuteNonQuery(shapeInsertSql);
                 }
-                // 按照机构名名查询机构数据，判断是否有该数据
                 string ruleSql = $"SELECT * FROM RULE WHERE RULE_ID = '{ruleId}';";
                 DataTable rule = DataBaseHelper.ExecuteQuery(ruleSql);
-                // 机构表判断是否有数据
                 if (rule == null || rule.Rows.Count == 0)
                 {
                    
-                    string shapeInsertSql = $"INSERT INTO INSTITUTE (RULE_ID,RULE_NAME,RULE_EN_NAME,GUID)VALUES('{ruleId}','{jsonEntity.RULE_NAME}','{jsonEntity.RULE_EN_NAME}','{Guid.NewGuid().ToString()}');";
+                    string ruleInsertSql = $"INSERT INTO RULE (RULE_ID,RULE_NAME,RULE_EN_NAME,GUID)VALUES('{ruleId}','{jsonEntity.RULE_NAME}','{jsonEntity.RULE_EN_NAME}','{Guid.NewGuid().ToString()}');";
-                    DataBaseHelper.ExecuteNonQuery(shapeInsertSql);
+                    DataBaseHelper.ExecuteNonQuery(ruleInsertSql);
                 }
                
                 // 定级数据登录