Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -221,6 +221,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
                     throw new BadRequest("角色只能增加, 不能删除");
                 }
             }
+            //去掉空角色
+            List<Long> role = userDataZHDto.getRole();
+            if(CollectionUtil.isNotEmpty(role)){
+                if(role.contains(userGroupempty)){
+                    logger.info("移除空角色");
+                    role.remove(userGroupempty);
+                }
+            }
             // 1 修改平台用户
             List<RoleModel> userRoleList = new ArrayList<>();
             AgencyUserModel agencyUserModel = new AgencyUserModel();