fix:我的sop一键群发

fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -10,7 +10,10 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.PubFun;
+import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.framework.security.LoginUser;
+import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwGroupChatUser;
 import com.fs.qw.domain.QwTag;
 import com.fs.qw.mapper.QwTagMapper;
@@ -20,6 +23,7 @@ import com.fs.qw.param.SopExternalContactInfo;
 import com.fs.qw.service.IQwExternalContactService;
 import com.fs.qw.service.IQwGroupChatUserService;
 import com.fs.qw.service.IQwTagService;
+import com.fs.qw.service.IQwUserService;
 import com.fs.sop.domain.SopUserLogsInfo;
 import com.fs.sop.params.BatchSopUserLogsInfoParam;
 import com.fs.sop.params.SendUserLogsInfoMsgParam;
@@ -62,6 +66,10 @@ public class SopUserLogsInfoController extends BaseController
     private IQwGroupChatUserService qwGroupChatUserService;
 
     private static final Gson GSON = new Gson();
+    @Autowired
+    private IQwUserService qwUserService;
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 查询sopUserLogsInfo列表
@@ -528,6 +536,15 @@ public class SopUserLogsInfoController extends BaseController
     @RepeatSubmit
     public R sendUserLogsInfoMsgSop(@RequestBody SendUserLogsInfoMsgParam param)
     {
+        if (param.getIsMine() != null && param.getIsMine() == 1) {
+            //我的sop
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            //查询qwUserId
+            List<String> qwUserIds = qwUserService.selectQwUserListByCompanyUserId(loginUser.getUser().getUserId(), param.getCorpId());
+            if (qwUserIds != null && !qwUserIds.isEmpty()) {
+                param.setQwUserIds(qwUserIds);
+            }
+        }
         return sopUserLogsInfoService.sendUserLogsInfoMsgSop(param);
     }
 

fs-service/src/main/java/com/fs/sop/mapper/SopUserLogsMapper.java

@@ -368,6 +368,10 @@ List<SopUserLogsVO> selectSopUserLogsGroupListByParam(@Param("maps") SopUserLogs
             "WHERE corp_id = #{param.corpId} " +
             "and sop_id in" +
             "<foreach  item='item' index='index' collection='param.sopIds' open='(' separator=',' close=')'> #{item}    </foreach>" +
+            "<if test=\"param.qwUserIds != null and param.qwUserIds.size > 0\">" +
+            "and qw_user_id in" +
+            "<foreach  item='item' index='index' collection='param.qwUserIds' open='(' separator=',' close=')'> #{item}    </foreach>" +
+            "</if>" +
             "</script>"})
     List<String> getSopUserLogsIds(@Param("param")SendUserLogsInfoMsgParam param);
 

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

@@ -2,6 +2,8 @@ package com.fs.sop.params;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * 一键群发
 */
@@ -30,4 +32,8 @@ public class SendUserLogsInfoMsgParam {
 
     private String sendTime;
 
+    private Integer isMine; //1:我的营期
+
+    private List<String> qwUserIds; //当isMine为1 需要查询该主体下该员工的营期
+
 }