fix

@@ -70,6 +70,7 @@ public class LoginInterceptor implements HandlerInterceptor {
         StpUtil.checkLogin();
         final var enterpriseId = Convert.toInt(StpUtil.getExtra(CommonConstants.ENTERPRISE_ID));
         final var loginSource = Convert.toInt(StpUtil.getExtra(CommonConstants.LOGIN_SOURCE));
+        final var userId = StpUtil.getExtra(CommonConstants.USER_ID);
         if (loginSource.equals(LoginSourceEnum.CUSTOMER.getValue())) {
             final var openId = Convert.toStr(StpUtil.getExtra(CommonConstants.OPEN_ID));
             final var loginId = StpUtil.getLoginIdAsInt();
@@ -115,8 +116,7 @@ public class LoginInterceptor implements HandlerInterceptor {
             builder.id(loginId).enterpriseId(enterpriseId).name(operator.getName()).loginSource(LoginSourceEnum.KDS);
             return true;
         } else {
-            final var loginId = StpUtil.getLoginIdAsString();
-            builder.openId(loginId).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
+            builder.id(userId == null ? null : Convert.toInt(userId)).openId(StpUtil.getLoginIdAsString()).enterpriseId(enterpriseId).loginSource(LoginSourceEnum.MINI_PROGRAM);
             return true;
         }
     }

@@ -123,6 +123,9 @@ public class MealOrderServiceRpcClient {
     }
 
     public List<SingleDinerRpcResponse> getDinersByIds(int enterpriseId, List<Integer> dinerIds) {
+        if (CollectionUtils.isEmpty(dinerIds)) {
+            return Collections.emptyList();
+        }
         return mealOrderServiceRpcBlockingStub.getDinersByIds(GetDinersByIdsRpcRequest.newBuilder()
                 .setEnterpriseId(enterpriseId)
                 .addAllIds(dinerIds)
@@ -148,6 +151,9 @@ public class MealOrderServiceRpcClient {
     }
 
     public List<SingleGradeClassRpcResponse> getGradeClassesByIds(int enterpriseId, List<Integer> gradeClassIds) {
+        if (CollectionUtils.isEmpty(gradeClassIds)) {
+            return Collections.emptyList();
+        }
         return mealOrderServiceRpcBlockingStub.getGradeClassesByIds(GetGradeClassesByIdsRpcRequest.newBuilder()
                 .setEnterpriseId(enterpriseId)
                 .addAllIds(gradeClassIds)
@@ -167,6 +173,9 @@ public class MealOrderServiceRpcClient {
     }
 
     public List<SingleMealOrderRpcResponse> queryReserveMealOrdersByDinerIds(int enterpriseId, List<Integer> dinerIds) {
+        if (CollectionUtils.isEmpty(dinerIds)) {
+            return Collections.emptyList();
+        }
         return mealOrderServiceRpcBlockingStub.queryReserveMealOrdersByDinerIds(QueryReserveMealOrdersByDinerIdsRpcRequest.newBuilder()
                 .setEnterpriseId(enterpriseId)
                 .addAllDinerIds(dinerIds)
@@ -201,6 +210,9 @@ public class MealOrderServiceRpcClient {
     }
 
     public boolean deleteMpAccountDinerRefsByIds(int enterpriseId, List<Integer> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return false;
+        }
         return mealOrderServiceRpcBlockingStub.deleteMpAccountDinerRefsByIds(DeleteMpAccountDinerRefsByIdsRpcRequest.newBuilder()
                 .setEnterpriseId(enterpriseId)
                 .addAllIds(ids)
@@ -215,6 +227,9 @@ public class MealOrderServiceRpcClient {
     }
 
     public List<SingleMealMenuRecordRpcResponse> queryLatestMealMenuRecordsByClientIds(int enterpriseId, List<Integer> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
         return mealOrderServiceRpcBlockingStub.queryLatestMealMenuRecordsByClientIds(QueryLatestMealMenuRecordsByClientIdsRpcRequest.newBuilder()
                 .setEnterpriseId(enterpriseId)
                 .addAllClientId(ids)

@@ -66,9 +66,10 @@ public class LoginServiceImpl implements LoginService {
             } else {
                 mpAccountId = mpAccountByOpenId.getId();
             }
-            Assert.isTrue(mpAccountId == 0, "创建小程序账号失败");
-            StpUtil.login(mpAccountId, SaLoginModel.create()
+            Assert.isTrue(mpAccountId != 0, "创建小程序账号失败");
+            StpUtil.login(loginDto.getOpenId(), SaLoginModel.create()
                     .setExtra(CommonConstants.ENTERPRISE_ID, loginDto.getEnterpriseId())
+                    .setExtra(CommonConstants.USER_ID, mpAccountId)
                     .setExtra(CommonConstants.LOGIN_SOURCE, loginDto.getLoginSourceEnum().getValue())
                     .build());
             return StpUtil.getTokenInfo();