fs-service-system/src/main/java/com/fs/sop/mapper/SopUserLogsInfoMapper.java

@@ -3,10 +3,7 @@ package com.fs.sop.mapper;
 import com.fs.common.annotation.DataSource;
 import com.fs.common.enums.DataSourceType;
 import com.fs.sop.domain.SopUserLogsInfo;
-import com.fs.sop.params.BatchSopUserLogsInfoParamU;
-import com.fs.sop.params.DeleteQwSopParam;
-import com.fs.sop.params.SopUserLogsInfoDelParam;
-import com.fs.sop.params.SopUserLogsInfoParam;
+import com.fs.sop.params.*;
 import com.fs.sop.vo.SopUserLogsInfoVOE;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -167,7 +164,7 @@ public interface SopUserLogsInfoMapper {
     public List<SopUserLogsInfo> selectSopUserLogsInfoByIds(@Param("ids") String[] ids);
 
     @DataSource(DataSourceType.SOP)
-    public List<SopUserLogsInfo> selectSopUserLogsInfoByIdsHasUserId(@Param("ids") String[] ids);
+    public List<SopUserLogsInfo> selectSopUserLogsInfoByIdsHasUserId(SopUserLogsInfoByIdsHasUserIdParam param);
 
     /**
      * 修改sopUserLogsInfo

fs-service-system/src/main/java/com/fs/sop/params/SendUserLogsInfoMsgParam.java

@@ -17,4 +17,5 @@ public class SendUserLogsInfoMsgParam {
     private String userIdParam;
     private String startTime;
     private String corpId;
+    private Integer isRegister;
 }

fs-service-system/src/main/java/com/fs/sop/params/SopUserLogsInfoByIdsHasUserIdParam.java

@@ -0,0 +1,10 @@
+package com.fs.sop.params;
+
+import lombok.Data;
+
+@Data
+public class SopUserLogsInfoByIdsHasUserIdParam {
+
+    private String[] ids;
+    private Integer isRegister;
+}

fs-service-system/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -28,10 +28,7 @@ import com.fs.sop.domain.SopUserLogsInfo;
 import com.fs.sop.mapper.QwSopLogsMapper;
 import com.fs.sop.mapper.QwSopMapper;
 import com.fs.sop.mapper.SopUserLogsInfoMapper;
-import com.fs.sop.params.BatchSopUserLogsInfoParam;
-import com.fs.sop.params.BatchSopUserLogsInfoParamU;
-import com.fs.sop.params.SendUserLogsInfoMsgParam;
-import com.fs.sop.params.SopUserLogsParamByDate;
+import com.fs.sop.params.*;
 import com.fs.sop.service.IQwSopService;
 import com.fs.sop.service.ISopUserLogsInfoService;
 import com.fs.sop.service.ISopUserLogsService;
@@ -360,7 +357,11 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         List<FastGptChatReplaceWords> words = fastGptChatReplaceWordsMapper.selectAllFastGptChatReplaceWords();
 
 //        List<SopUserLogsInfo> sopUserLogsInfos = sopUserLogsInfoMapper.selectSopUserLogsInfoByIds(param.getIds());
-        List<SopUserLogsInfo> sopUserLogsInfos = sopUserLogsInfoMapper.selectSopUserLogsInfoByIdsHasUserId(param.getIds());
+        SopUserLogsInfoByIdsHasUserIdParam userIdParam=new SopUserLogsInfoByIdsHasUserIdParam();
+        userIdParam.setIds(param.getIds());
+        userIdParam.setIsRegister(param.getIsRegister());
+
+        List<SopUserLogsInfo> sopUserLogsInfos = sopUserLogsInfoMapper.selectSopUserLogsInfoByIdsHasUserId(userIdParam);
 
         String[] userKey = param.getUserIdParam().split("\\|");
         String qwUserId = userKey[0].trim();

fs-service-system/src/main/resources/mapper/sop/SopUserLogsInfoMapper.xml

@@ -30,12 +30,16 @@
         where id = #{id}
     </select>
 
-    <select id="selectSopUserLogsInfoByIdsHasUserId" parameterType="java.util.List" resultMap="SopUserLogsInfoResult">
+    <select id="selectSopUserLogsInfoByIdsHasUserId" parameterType="com.fs.sop.params.SopUserLogsInfoByIdsHasUserIdParam" resultMap="SopUserLogsInfoResult">
         <include refid="selectSopUserLogsInfoVo"/>
-        WHERE fs_user_id is not null and fs_user_id !=0 and id IN
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        <where>
+            id IN
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            <if test="isRegister == 1">and fs_user_id is not null and fs_user_id != 0 </if>
+        </where>
+        order by crt_Time desc
     </select>