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

src/main/java/com/xjrsoft/module/app/controller/BaseAppFunctionController.java

@@ -68,7 +68,7 @@ public class BaseAppFunctionController {
 
         LambdaQueryWrapper<BaseAppFunction> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                .orderByDesc(BaseAppFunction::getSortCode)
+                .orderByAsc(BaseAppFunction::getSortCode)
                 .eq(BaseAppFunction::getType, dto.getType())
                 .select(BaseAppFunction.class, x -> VoToColumnUtil.fieldsToColumns(BaseAppFunctionListVo.class).contains(x.getProperty()));
 

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

@@ -147,8 +147,12 @@ public class LoginServiceImpl implements ILoginService {
         LoginByCodeVo result = new LoginByCodeVo();
         String[] ids = weChatUtil.getMpOpenid(dto.getCode());
         if (ids == null) throw new MyException("code无效");
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getUnionId, ids[1]));
-        if (user == null) throw new MyException("code无效");
+        if (StrUtil.isEmpty(ids[1])) {
+            throw new MyException("无法获取Uid"+ids[0]+"-"+ids[1]);
+        }
+        List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getUnionId, ids[1]));
+        if (userList == null || userList.size() == 0) throw new MyException("code无效");
+        User user = userList.get(0);
         user.setOpenId(ids[0]);
         userService.updateById(user);
         result.setToken(ids[0]);