三七 6 dní pred
rodič
commit
fdc367d22c

+ 4 - 1
fs-service/src/main/java/com/fs/fastGpt/service/impl/FastgptEventLogTotalServiceImpl.java

@@ -173,7 +173,10 @@ public class FastgptEventLogTotalServiceImpl extends ServiceImpl<FastgptEventLog
 
         if(fastgptEventLogTotal.getUserIds() != null && !fastgptEventLogTotal.getUserIds().isEmpty()){
             List<String> userIds = fastgptEventLogTotal.getUserIds();
-            String result = String.join(",", userIds);
+            String result = userIds.stream()
+                    .filter(userId -> userId.startsWith("user_") && userId.length() > 5)
+                    .map(userId -> userId.substring(5))
+                    .collect(Collectors.joining(","));
             List<CompanyUser> companyUserList = companyService.selectCompanyListByIds(result);
             String qwUserIds = companyUserList.stream()
                     .map(CompanyUser::getQwUserId)

+ 4 - 9
fs-service/src/main/resources/mapper/company/CompanyMapper.xml

@@ -242,15 +242,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
     <select id="selectCompanyListByIds" resultType="com.fs.company.domain.CompanyUser">
-        select role_id roleId,role_name roleName from fastgpt_role
-        <where>
-            <if test="roleIds != null">
-                role_id in
-                <foreach collection="roleIds" item="roleId" separator="," open="(" close=")">
-                    #{roleId}
-                </foreach>
-            </if>
-        </where>
+        select user_id userId,company_id companyId,qw_user_id qwUserId  from company_user where user_id in
+        <foreach collection="userIds.split(',')" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
     </select>
 
     <select id="selectAllCompanyList" resultType="com.fs.his.vo.OptionsVO">