chendayu hace 2 años
padre
commit
933c851c3d

+ 2 - 2
PAS/src/main/java/cn/cslg/pas/service/ScratchWordsService.java

@@ -288,8 +288,8 @@ public class ScratchWordsService extends ServiceImpl<ScratchWordsMapper, Scratch
         List<GroupName> groupNames = scratchWordsMapper.queryGroupScratchs(personIds, search, queryGroupScratchsDTO.getGrouping(), tenantId, personId, projectIds, reportIds);
         PageInfo<GroupName> pageInfo = new PageInfo<>(groupNames);
 
-        if (groupNames.size() > 0) {
-            //装载创建人名称
+        //若本次请求是根据创建人分组查询,则装载创建人名称
+        if (groupNames.size() > 0 && queryGroupScratchsDTO.getGrouping().equals("name")) {
             List<Integer> createPersonIds = groupNames.stream().map(GroupName::getCreateId).collect(Collectors.toList());
             res = outInterfaceService.getPersonnelByIdsFromPCS(createPersonIds);
             jsonObject = JSONObject.parseObject(res);