SQL层级处理的支持

yzg-util-db/src/main/java/com/yanzuoguang/dao/impl/BaseDaoImpl.java

@@ -650,10 +650,11 @@ public abstract class BaseDaoImpl extends BaseDaoSql implements BaseDao {
             return;
         }
 
+        String md5Field = this.table.getTable().getMD5KeyName();
         // 获取前台分组的MD5标识
         String md5 = this.getMd5(DaoConst.GROUP_QUERY, model);
-        if (!StringHelper.isEmpty(this.table.getTable().getMD5KeyName())) {
-            ObjectHelper.set(model, this.table.getTable().getMD5KeyName(), md5);
+        if (!StringHelper.isEmpty(md5Field)) {
+            ObjectHelper.set(model, md5Field, md5);
         }
 
         if (this.table.getTable().getKeyType() == String.class) {
@@ -679,11 +680,12 @@ public abstract class BaseDaoImpl extends BaseDaoSql implements BaseDao {
 
         // 获取标识的实体
         T from;
+        String md5Field = this.table.getTable().getMD5KeyName();
         if (this.table.getTable().getKeyType() == String.class) {
             from = model;
-        } else if (!StringHelper.isEmpty(this.table.getTable().getMD5KeyName())) {
+        } else if (!StringHelper.isEmpty(md5Field)) {
             Map<String, Object> map = new HashMap<>(DaoConst.COLLECTION_INIT_SIZE);
-            map.put(this.table.getTable().getMD5KeyName(), md5);
+            map.put(md5Field, ObjectHelper.get(model, md5Field));
             from = this.load(map, cls);
         } else {
             from = this.queryFirst(cls, DaoConst.GROUP_QUERY, model);