Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

@@ -79,4 +79,14 @@ public interface UserApiService {
      * @throws
      */
     ServiceResponse<List<UserListDTO>> listUser(UserListQO params);
+
+    /**
+     * 根据用户ID list查询用户信息
+     * @Title: listUserByIdList

+     * @Description:
+    
 * @author guojuxing
+     * @param userIdList

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UserDTO>>

+    
 */
+    ServiceResponse<List<UserDTO>> listUserByIdList(List<Integer> userIdList);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java

@@ -96,4 +96,6 @@ public interface TabSysUserMapper {
     Integer getFirstNotInUserId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> userIdList);
 
     Integer countUserByUserIds(@Param("ids") List<Integer> userIdList);
+
+    List<TabSysUser> listUserByIdList(@Param("ids")List<Integer> userIdList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserService.java

@@ -79,4 +79,14 @@ public interface UserService {
     Integer getAllCheckValue(Integer enterpriseId, List<Integer> userIdList);
 
     boolean validUserIsNotExist(List<Integer> userIdList);
+
+    /**
+     * 用户ID list查询用户信息
+     * @Title: listUserByIdList

+     * @Description:
+    
 * @author guojuxing
+     * @param userIdList

+     * @return  java.util.List<com.gic.auth.entity.TabSysUser>

+    
 */
+    List<TabSysUser> listUserByIdList(List<Integer> userIdList);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserServiceImpl.java

@@ -97,4 +97,9 @@ public class UserServiceImpl implements UserService {
         Integer count = tabSysUserMapper.countUserByUserIds(userIdList);
         return count != userIdList.size();
     }
+
+    @Override
+    public List<TabSysUser> listUserByIdList(List<Integer> userIdList) {
+        return tabSysUserMapper.listUserByIdList(userIdList);
+    }
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -230,6 +231,15 @@ public class UserApiServiceImpl implements UserApiService {
         return ServiceResponse.success(list);
     }
 
+    @Override
+    public ServiceResponse<List<UserDTO>> listUserByIdList(List<Integer> userIdList) {
+        List<TabSysUser> list = userService.listUserByIdList(userIdList);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(UserDTO.class, list));
+        }
+        return ServiceResponse.success(new ArrayList<>());
+    }
+
     /**
      * 保存关联数据，角色关联、资源关联
      * @Title: saveRole


gic-platform-auth-service/src/main/resources/mapper/TabSysUserMapper.xml

@@ -287,4 +287,18 @@
         #{item}
       </foreach>
   </select>
+
+
+  <select id="listUserByIdList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_sys_user
+    where status = 1
+    <if test="ids != null and ids.size() > 0">
+      and user_id in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+  </select>
 </mapper>
\ No newline at end of file