Bläddra i källkod

Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

chengyao 3 år sedan
förälder
incheckning
65177fbbcb

+ 1 - 1
security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -109,7 +109,7 @@ public class UserManagementFacade {
         QueryWrapper<Role> roleQueryWrapper = new QueryWrapper<>();
         roleQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         roleQueryWrapper.eq("status", StatusEnum.Enable.getKey());
-        roleQueryWrapper.in("id", roleIdList);
+        roleQueryWrapper.in(ListUtil.isNotEmpty(roleIdList), "id", roleIdList);
         List<String> roleIdNames = roleFacade.list(roleQueryWrapper).stream().map(i -> i.getId() + "_" + i.getName()).collect(Collectors.toList());
 
         BeanUtils.copyProperties(user, userDTO);