Merge remote-tracking branch 'origin/master'

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -775,9 +775,13 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         sopLogs.setCorpId(logVo.getCorpId());
         sopLogs.setLogType(ruleTimeVO.getType());
         sopLogs.setTakeRecords(0);
-        if(StringUtils.isNotEmpty(logVo.getUserId())){
-            String[] split = logVo.getUserId().split("\\|");
-            sopLogs.setQwUserKey(Long.parseLong(split[0]));
+        try {
+            if(StringUtils.isNotEmpty(logVo.getUserId())){
+                String[] split = logVo.getUserId().split("\\|");
+                sopLogs.setQwUserKey(Long.parseLong(split[0]));
+            }
+        }catch (Exception e){
+            log.error("设置qwUserId异常", e);
         }
 
         if (isOfficial == 1) {
@@ -1844,7 +1848,11 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         sopLogs.setExternalUserName(externalContact.getName());
         sopLogs.setFsUserId(finishLog.getUserId() != null ? finishLog.getUserId() : null );
         sopLogs.setUserLogsId("-");
-        sopLogs.setQwUserKey(finishLog.getQwUserId());
+        try {
+            sopLogs.setQwUserKey(finishLog.getQwUserId());
+        }catch (Exception e){
+            log.error("设置qwUserId异常", e);
+        }
         // 解析模板设置
         List<QwSopCourseFinishTempSetting.Setting> settings = parseSettings(finishTemp.getSetting());
         if (settings == null) {

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

@@ -834,7 +834,11 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                 setting.setVideoId(param.getVideoId());
                 setting.setCourseId(param.getCourseId());
                 setting.setCourseType(param.getCourseType());
-                sopLogs.setQwUserKey(Long.valueOf(qwUserId));
+                try {
+                    sopLogs.setQwUserKey(Long.valueOf(qwUserId));
+                }catch (Exception e){
+                    log.error("设置qwUserId异常", e);
+                }
                 sopLogs.setContentJson(JSON.toJSONString(setting));
 
                 sopLogsList.add(sopLogs);
@@ -1025,7 +1029,11 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             setting.setVideoId(param.getVideoId());
             setting.setCourseId(param.getCourseId());
             setting.setCourseType(param.getCourseType());
-            sopLogs.setQwUserKey(qwUser.getId());
+            try {
+                sopLogs.setQwUserKey(qwUser.getId());
+            }catch (Exception e){
+                log.error("设置qwUserId异常", e);
+            }
             sopLogs.setContentJson(JSON.toJSONString(setting));
 
             sopLogsList.add(sopLogs);