fix(controller): exception that occurs when the register_info does no…

…t exist (#1082) fix bug: exception that occurs when the register_info does not exist
star-whale · Aug 31, 2022 · c6d8c07 · c6d8c07
1 parent 1e3917c
commit c6d8c07
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/user/UserService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/user/UserService.java
@@ -137,6 +137,9 @@ public UserVO currentUser() {
             throw new StarWhaleApiException(new SWProcessException(ErrorType.DB)
                 .tip(String.format("Unable to find user by name %s", user.getName())), HttpStatus.INTERNAL_SERVER_ERROR);
         }
+        if(userMapper.existRegister() != null) {
+            userEntity.setUserEmail(userMapper.getUserEmail(userEntity.getId()));
+        }
         return userConvertor.convert(userEntity);
     }
 
@@ -153,6 +156,9 @@ public User currentUserDetail() {
 
     public UserVO findUserById(Long id) {
         UserEntity entity = userMapper.findUser(id);
+        if(userMapper.existRegister() != null) {
+            entity.setUserEmail(userMapper.getUserEmail(entity.getId()));
+        }
         return userConvertor.convert(entity);
     }
 

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/user/mapper/UserMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/user/mapper/UserMapper.java
@@ -28,6 +28,10 @@ public interface UserMapper {
 
     UserEntity findUserByName(@Param("userName") String userName);
 
+    String existRegister();
+
+    String getUserEmail(@Param("id")Long id);
+
     List<UserEntity> listUsers(@Param("userNamePrefix") String userNamePrefix);
 
     int changePassword(@Param("user")UserEntity user);

diff --git a/server/controller/src/main/resources/mapper/UserMapper.xml b/server/controller/src/main/resources/mapper/UserMapper.xml
@@ -20,10 +20,7 @@
                u.user_pwd_salt,
                u.user_enabled,
                u.created_time as user_created_time,
-               u.modified_time as user_modified_time,
-               (select if((select 1 from information_schema.tables where table_schema='starwhale' and table_name ='register_info'),
-                          (select email from register_info where user_id = u.id),
-                          null)) as user_email
+               u.modified_time as user_modified_time
         from user_info as u
         where u.id = #{id}
     </select>
@@ -35,14 +32,19 @@
                u.user_pwd_salt,
                u.user_enabled,
                u.created_time as user_created_time,
-               u.modified_time as user_modified_time,
-               (select if((select 1 from information_schema.tables where table_schema='starwhale' and table_name ='register_info'),
-                          (select email from register_info where user_id = u.id),
-                          null)) as user_email
+               u.modified_time as user_modified_time
         from user_info as u
         where u.user_name = #{userName}
     </select>
 
+    <select id="existRegister" resultType="String">
+        show tables like 'register_info'
+    </select>
+
+    <select id="getUserEmail" resultType="String">
+        select email from register_info where user_id = #{id}
+    </select>
+
     <select id="listUsers" resultMap="userResultMap">
         select u.id as user_id,
                u.user_name,