Browse Source

fix: 修复commit日志查询不到部分学生的问题

ZhengZiHan 2 years ago
parent
commit
eb5aaf49be

+ 9 - 8
web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java

@@ -16,7 +16,6 @@ import cn.seecoder.web.service.bug_list.BugListService;
 import cn.seecoder.web.service.commit.CommitLinkService;
 import cn.seecoder.web.service.commit.CommitService;
 import cn.seecoder.web.service.tree.TreeNodeService;
-import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,17 +121,19 @@ public class CommitLinkServiceImpl implements CommitLinkService {
         //ANA 日志需要打出用户commit的信息
         try{
             JSONObject object = new JSONObject();
-            object.put("user_id", UserService.loginUser().getId());
-            object.put("commit_id",po.getId());
-            object.put("project_id",po.getProjectId());
-            object.put("commit_name",po.getGitlabUsername());
+            object.put("user_id", userMapper.selectIdByEmail(po.getEmail())==null?-1:userMapper.selectIdByEmail(po.getEmail()));
+            object.put("commit_id",po.getId()==null?-1:po.getId());
+            object.put("project_id",po.getProjectId()==null?-1:po.getProjectId());
+            object.put("commit_name",po.getGitlabUsername()==null?-1:po.getGitlabUsername());
             object.put("commit_time",po.getTimestamp());
-            object.put("message",po.getMessage());
-            object.put("type",po.getRelatedType());
+            object.put("message",po.getMessage()==null?-1:po.getMessage());
+            object.put("type",po.getRelatedType()==null?-1:po.getRelatedType());
 
             String data = JSONObject.toJSONString(object);
             LogTrackingUtil.log(data, OpType.COMMIT);
-        }catch (Exception e){}
+        }catch (Exception e){
+            log.error("Error occurred while putting values into JSONObject: {}", e.getMessage());
+        }
 
         commitMapper.insert(po);
     }