修改 openid

src/main/java/com/xjrsoft/module/system/dto/LoginByCodeDto.java

@@ -10,4 +10,8 @@ public class LoginByCodeDto {
     @ApiModelProperty("Code")
     @NotBlank(message = "Code不能为空！")
     private String code;
+
+    @ApiModelProperty("type")
+    @NotBlank(message = "类型不能为空！")
+    private Integer type;
 }

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

@@ -119,16 +119,14 @@ public class LoginServiceImpl implements ILoginService {
         if (ids == null) throw new MyException("code无效");
 
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotEmpty(ids[1])) {
-            queryWrapper.eq(User::getUnionId, ids[1]);
-            result.setUnionId(ids[1]);
-        } else {
-            queryWrapper.eq(User::getOpenId, ids[0]);
+        if (dto.getType() == 0) {
             result.setOpenid(ids[0]);
+            queryWrapper.eq(User::getOpenId, ids[0]);
+        } else {
+            result.setUnionId(ids[1]);
+            queryWrapper.eq(User::getUnionId, ids[1]);
         }
         User loginUser = userService.getOne(queryWrapper);
-
-//        result.setOpenid(openId);
         if (loginUser == null) {
             return result;
         }