Merge branch 'master' of https://github.com/chubaostream/joyqueue int…

…o dev2
jd-opensource · Jan 18, 2021 · 1105336 · 1105336
2 parents 40f3763 + a88914c
commit 1105336
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...-data-repository-api/src/main/java/org/joyqueue/repository/ApplicationUserRepository.java b/...-data-repository-api/src/main/java/org/joyqueue/repository/ApplicationUserRepository.java
@@ -31,5 +31,5 @@
 public interface ApplicationUserRepository extends PageRepository<ApplicationUser, QApplicationUser>, Uniqueable<ApplicationUser> {
     ApplicationUser findByUserApp(ApplicationUser applicationUser);
     int deleteByAppId(long appId);
-    List<String> findAppByUser(@Param("user") String user);
+    List<ApplicationUser> findAppByUser(@Param("user") String user);
 }
diff --git a/...repository/joyqueue-data-repository-mybatis/src/main/resources/mapper/ApplicationUser.xml b/...repository/joyqueue-data-repository-mybatis/src/main/resources/mapper/ApplicationUser.xml
@@ -126,7 +126,7 @@
 
     <select id="findAppByUser" resultMap="baseResultMap" parameterType="java.lang.String">
         SELECT
-        app_code
+        <include refid="baseColumn"/>
         FROM
         application_user
         WHERE user_code=#{user} and status != -1

diff --git a/...data/joyqueue-data-service/src/main/java/org/joyqueue/service/ApplicationUserService.java b/...data/joyqueue-data-service/src/main/java/org/joyqueue/service/ApplicationUserService.java
@@ -28,5 +28,5 @@
 public interface ApplicationUserService extends PageService<ApplicationUser, QApplicationUser>, Uniqueable<ApplicationUser> {
     ApplicationUser findByUserApp(String user, String app);
     int deleteByAppId(long appId);
-    List<String> findAppByUser(String user);
+    List<ApplicationUser> findAppByUser(String user);
 }
diff --git a/...ueue-data-service/src/main/java/org/joyqueue/service/impl/ApplicationUserServiceImpl.java b/...ueue-data-service/src/main/java/org/joyqueue/service/impl/ApplicationUserServiceImpl.java
@@ -45,7 +45,7 @@ public int deleteByAppId(long appId) {
     }
 
     @Override
-    public List<String> findAppByUser(String user) {
+    public List<ApplicationUser> findAppByUser(String user) {
         return repository.findAppByUser(user);
     }
 }