Browse Source

根据角色列表查询人员,处理因为角色未关联账号引发的bug

lixing 4 years ago
parent
commit
ce21809615

+ 1 - 0
fm-person/src/main/java/com/persagy/fm/person/model/dto/PageQueryByRoleIdsDTO.java

@@ -18,4 +18,5 @@ public class PageQueryByRoleIdsDTO extends PageDTO {
     @ApiModelProperty(value = "角色主键列表", required = true)
     @ApiModelProperty(value = "角色主键列表", required = true)
     @NotEmpty(message = "角色主键列表不能为空")
     @NotEmpty(message = "角色主键列表不能为空")
     private List<String> roleIds;
     private List<String> roleIds;
+
 }
 }

+ 3 - 0
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonQueryServiceImpl.java

@@ -586,6 +586,9 @@ public class PersonQueryServiceImpl extends ServiceImpl<PersonMapper, Person>
 
 
         // 查询人员信息
         // 查询人员信息
         QueryWrapper<Person> queryWrapper = personServiceCommonTool.getDefaultPersonQueryWrapper();
         QueryWrapper<Person> queryWrapper = personServiceCommonTool.getDefaultPersonQueryWrapper();
+        if (CollectionUtils.isEmpty(accountIds)) {
+            return result;
+        }
         queryWrapper.in(Person.PROP_ACCOUNT_ID, accountIds);
         queryWrapper.in(Person.PROP_ACCOUNT_ID, accountIds);
         List<Person> persons = list(queryWrapper);
         List<Person> persons = list(queryWrapper);
         Map<String, Person> accountIdPersonMap = new HashMap<>();
         Map<String, Person> accountIdPersonMap = new HashMap<>();