menu

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -221,14 +221,12 @@ public class MenuController {
     public R edit(@Valid @RequestBody UpdateMenuDto dto) {
         long count = menuService.count(Wrappers.<Menu>query().lambda()
                 .ne(Menu::getId, dto.getId()).and(wrapper ->
-                        wrapper.eq(Menu::getName, dto.getName())
-                                .or()
-                                .eq(Menu::getCode, dto.getCode())
+                        wrapper.eq(Menu::getCode, dto.getCode())
                 )
         );
 
         if (count > 0) {
-            return R.error("菜单名或者菜单编码已经存在！");
+            return R.error("菜单编码已经存在！");
         }
         Menu menu = BeanUtil.toBean(dto, Menu.class);
 

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -124,11 +124,8 @@ public class LoginServiceImpl implements ILoginService {
         if (weChatUserInfo == null) throw new MyException("code无效");
 
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        if (dto.getType() == 0) {
-            queryWrapper.eq(User::getOpenId, weChatUserInfo.getOpenid());
-        } else {
-            queryWrapper.eq(User::getUnionId, weChatUserInfo.getUnionid());
-        }
+        queryWrapper.eq(User::getUnionId, weChatUserInfo.getUnionid());
+
         User loginUser = userService.getOne(queryWrapper);
         if (loginUser == null) {
             return result;