fix: 带条件的fetchLinks失效了

nutzam · Apr 17, 2017 · d82c835 · d82c835
1 parent fb4fc2f
commit d82c835
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>nutz</artifactId>
 	<packaging>jar</packaging>
 	<name>Nutz</name>
-	<version>1.r.62-SNAPSHOT</version>
+	<version>1.r.61</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

diff --git a/src/org/nutz/Nutz.java b/src/org/nutz/Nutz.java
@@ -33,7 +33,7 @@ public final class Nutz {
      * @return nutz 项目的版本号
      */
     public static String version() {
-        return String.format("%d.%s.%d-SNAPSHOT",
+        return String.format("%d.%s.%d",
                              majorVersion(),
                              releaseLevel(),
                              minorVersion());
@@ -50,7 +50,7 @@ public static int majorVersion() {
      * 发布流水
      */
     public static int minorVersion() {
-        return 62;
+        return 61;
     }
 
     /**

diff --git a/src/org/nutz/dao/impl/NutDao.java b/src/org/nutz/dao/impl/NutDao.java
@@ -590,7 +590,7 @@ public <T> T fetchLinks(final T obj, final String regex, final Condition cnd) {
             return null;
         Lang.each(obj, false, new Each<Object>() {
             public void invoke(int index, Object ele, int length) {
-                _fetchLinks(ele, regex, true, true, true);
+                _fetchLinks(ele, regex, true, true, true, cnd);
             }
         });
         return obj;
@@ -1082,7 +1082,7 @@ public <T> T fetchByJoin(Class<T> klass, String regex, Entity<T> en, MappingFiel
         String key = en.getTableName() + "." + mf.getColumnNameInSql();
         T t = fetchByJoin(klass, regex, Cnd.where(key, "=", value));
         if (t != null)
-            _fetchLinks(t, regex, false, true, true);
+            _fetchLinks(t, regex, false, true, true, null);
         return t;
     }
 
@@ -1096,7 +1096,7 @@ public <T> T fetchByJoin(Class<T> classOfT, String regex, Condition cnd) {
         _exec(pojo);
         T t = pojo.getObject(classOfT);
         if (t != null)
-            _fetchLinks(t, regex, false, true, true);
+            _fetchLinks(t, regex, false, true, true, null);
         return t;
     }
 
@@ -1110,19 +1110,19 @@ public <T> List<T> queryByJoin(Class<T> classOfT, String regex, Condition cnd) {
         List<T> list = pojo.getList(classOfT);
         if (list != null && list.size() > 0) 
             for (T t : list) {
-                _fetchLinks(t, regex, false, true, true);
+                _fetchLinks(t, regex, false, true, true, null);
             }
         return list;
     }
 
-    protected Object _fetchLinks(Object t, String regex, boolean visitOne, boolean visitMany, boolean visitManyMany) {
+    protected Object _fetchLinks(Object t, String regex, boolean visitOne, boolean visitMany, boolean visitManyMany, final Condition cnd) {
         EntityOperator opt = _optBy(t);
         if (null == opt)
             return t;
         if (visitMany)
-            opt.entity.visitMany(t, regex, doLinkQuery(opt, null));
+            opt.entity.visitMany(t, regex, doLinkQuery(opt, cnd));
         if (visitManyMany)
-            opt.entity.visitManyMany(t, regex, doLinkQuery(opt, null));
+            opt.entity.visitManyMany(t, regex, doLinkQuery(opt, cnd));
         if (visitOne)
             opt.entity.visitOne(t, regex, doFetch(opt));
         opt.exec();