From d189d93c6d5eaf8cf77718490a14d9d24dc6ffe9 Mon Sep 17 00:00:00 2001
From: chengqf <584883665@139.com>
Date: Wed, 17 May 2023 05:49:17 +0800
Subject: [PATCH] getInfo

---
 .../controller/sup/UserRegisterController.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java
index 358bd90..8070a32 100644
--- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java
+++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java
@@ -1,5 +1,7 @@
 package com.glxp.api.controller.sup;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
@@ -16,11 +18,14 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.sup.UserCertEntity;
+import com.glxp.api.entity.sup.UserPersonEntity;
 import com.glxp.api.entity.sup.UserRegisterEntity;
 import com.glxp.api.service.sup.UserCertService;
 import com.glxp.api.service.sup.UserPersonService;
@@ -59,12 +64,23 @@ public class UserRegisterController extends BaseController  {
     @GetMapping("/admin/auth/register/get/{mobile}")
     public BaseResponse getInfo(@PathVariable String mobile) {
         UserRegisterEntity userRegisterEntity = userRegisterService.getOne(new QueryWrapper<UserRegisterEntity>().eq("mobile", mobile));
+        List<UserPersonEntity> userPersons = new ArrayList<>();
+        List<UserCertEntity> userCerts = new ArrayList<>();
         if(userRegisterEntity==null) {
             userRegisterEntity = new UserRegisterEntity();
+        } else {
+            userPersons = userPersonService.list(new QueryWrapper<UserPersonEntity>().eq("registerId", userRegisterEntity.getId()));
+            userCerts = userCertService.list(new QueryWrapper<UserCertEntity>().eq("registerId", userRegisterEntity.getId()));
         }
-        return ResultVOUtils.success(userRegisterEntity);
+        BaseResponse res = ResultVOUtils.success(userRegisterEntity);
+        JSONObject object = (JSONObject) res.getData();
+        object.put("userPersons", userPersons);
+        object.put("userCerts", userCerts);
+        res.setData(object);
+        return res;
     }
 
+    
     @PostMapping("/admin/auth/register/save")
     public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession,
                                      BindingResult bindingResult) {