Skip to content

Commit 99583f8

Browse files
committed
成为0.9.9版本;
1 parent bfd466a commit 99583f8

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.github.limeng32</groupId>
66
<artifactId>mybatis.flying</artifactId>
7-
<version>0.9.8</version>
7+
<version>0.9.9</version>
88
<packaging>jar</packaging>
99

1010
<name>mybatis.flying</name>

src/main/java/indi/mybatis/flying/AerialView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
public class AerialView {
55

66
/* Flying current version */
7-
public static final String FLYING_VERSION = "0.9.8";
7+
public static final String FLYING_VERSION = "0.9.9";
88

99
/* Current version alias */
1010
public static final String FLYING_NAME = "QING_MING";

src/main/java/indi/mybatis/flying/builders/SqlBuilder.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,14 @@ private static void dealMapperAnnotationIterationForCount(Object object, StringB
12921292
fromSql.append(originFieldMapper.getAssociationType().value()).append(tableName.sqlSelect()).append(_ON_)
12931293
.append(originTableName.sqlWhere()).append(originFieldMapper.getDbFieldName()).append(_EQUAL_)
12941294
.append(tableName.sqlWhere()).append(originFieldMapper.getDbAssociationUniqueKey());
1295+
ForeignAssociationMapper[] fams = originFieldMapper.getForeignAssociationMappers();
1296+
if (fams != null && fams.length > 0) {
1297+
for (ForeignAssociationMapper fam : fams) {
1298+
fromSql.append(_AND_).append(originTableName.sqlWhere()).append(fam.getDbFieldName())
1299+
.append(fam.getCondition().value()).append(tableName.sqlWhere())
1300+
.append(fam.getDbAssociationFieldName());
1301+
}
1302+
}
12951303
}
12961304

12971305
/* Handle the conditions in the fieldMapper */

src/test/java/indi/mybatis/flying/test/PermissionTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import indi.mybatis.flying.pojo.Account_;
2525
import indi.mybatis.flying.pojo.Permission;
2626
import indi.mybatis.flying.pojo.condition.Account_Condition;
27-
import indi.mybatis.flying.pojo.condition.PermissionCondition;
2827
import indi.mybatis.flying.service.AccountService;
2928
import indi.mybatis.flying.service.PermissionService;
3029

@@ -69,5 +68,8 @@ public void testSelect() {
6968
Assert.assertEquals(1, e.getId().intValue());
7069
Assert.assertEquals(20, e.getPermission().getFakeId().intValue());
7170
}
71+
72+
int c = accountService.count(a);
73+
Assert.assertEquals(1, c);
7274
}
7375
}

0 commit comments

Comments
 (0)