Merge remote-tracking branch 'origin/master'

src/main/java/org/sss/presentation/noui/cache/AbstractCache.java

@@ -2,6 +2,7 @@ package org.sss.presentation.noui.cache;
 
 import org.hibernate.Criteria;
 import org.hibernate.Query;
+import org.hibernate.internal.QueryImpl;
 import org.sss.common.model.CacheController;
 import org.sss.common.model.IModuleList;
 import org.sss.presentation.noui.common.Constants;
@@ -60,6 +61,24 @@ public abstract class AbstractCache implements CacheController {
             sb.append(SPLIT.intern());
             sb.append(offset);
         }
+        //添加数据计算key
+        if(o instanceof QueryImpl)
+        {
+            Object[] values = ((QueryImpl)o).valueArray();
+            if(values != null)
+            {
+                for (Object val:values) {
+                    if(val == null)
+                    {
+                        sb.append("null");
+                    }
+                    else
+                        sb.append(val.toString());
+                    sb.append(',');
+                }
+            }
+        }
+
         return sb.toString();
     }