修复菜单重复

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -71,10 +71,9 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
     public R<Long> register(AddDto addDto) {
         //校验
         LambdaQueryWrapper<SysWorkUser> lambdaQueryWrapper = new LambdaQueryWrapper<SysWorkUser>()
-                .eq(SysWorkUser::getAccount, addDto.getAccount());
-        if (!StringUtils.isEmpty(addDto.getEmail())) {
-            lambdaQueryWrapper.or().eq(SysWorkUser::getEmail, addDto.getEmail());
-        }
+                .eq(SysWorkUser::getAccount, addDto.getAccount())
+                .or()
+                .eq(SysWorkUser::getEmail, addDto.getEmail());
         long count = count(lambdaQueryWrapper);
         if (count > 0) {
             return R.fail("账号或邮箱已存在");

authorize-api/src/main/java/com/xy/dto/SysWorkUser/AddDto.java

@@ -22,6 +22,7 @@ public class AddDto {
     @Pattern(regexp = "^[a-zA-z0-9]{6,11}$", message = "account必须为数字或字母，长度6-11位之间")
     private String account;
 
+    @NotBlank(message = "email不可为空")
     @ApiModelProperty(value = "邮箱")
     @Pattern(regexp = "^(\\w+([-.][A-Za-z0-9]+)*){3,18}@\\w+([-.][A-Za-z0-9]+)*\\.\\w+([-.][A-Za-z0-9]+)*$", message = "email格式错误")
     private String email;