|
@@ -421,6 +421,8 @@ public class MarkLogAop {
|
|
|
markUser = markUserRepo.findOne(markTask.getMarkerId());
|
|
|
} else {
|
|
|
String userId = request.getHeader("userId");
|
|
|
+ // markLeaderId是批量打回小工具中的参数
|
|
|
+ userId = StringUtils.isBlank(userId) || (StringUtils.isNotBlank(userId) && "0".equals(userId)) ? request.getHeader("markLeaderId") : userId;
|
|
|
markUser = markUserRepo.findOne(Long.valueOf(userId));
|
|
|
if(Objects.isNull(markUser)) {
|
|
|
String[] strs = token.split("#");
|