From 7dec78512b9a85eaec83baf6a81a3d109a8f4aa9 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Tue, 5 Nov 2024 14:10:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/service/impl/UserServiceImpl.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
index 5d8e470..6683479 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
@@ -203,7 +203,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
   @Override
   public User getByPhone(String phone) {
-    return query().eq("phone", phone).one();
+    return getOne(
+            new LambdaQueryWrapper<User>()
+                    .eq(User::getPhone, phone)
+                    .orderByDesc(User::getUserId).last("limit 1")
+    );
   }
 
   @Override

From 3ec9b5665be254ff80f037749cbfa6016f751bd7 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 7 Nov 2024 12:17:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/common/system/entity/Organization.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
index 70b4fb8..ccf50f5 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
@@ -95,6 +95,15 @@ public class Organization implements Serializable {
     @ApiModelProperty(value = "是否合作单位")
     private Integer isCoop;
 
+    @ApiModelProperty(value = "法定代表人")
+    private String legalPerson;
+
+    @ApiModelProperty(value = "成立日期")
+    private String setUpDate;
+
+    @ApiModelProperty(value = "企业标签")
+    private String tag;
+
     @ApiModelProperty(value = "排序号")
     private Integer sortNumber;
 

From 3d7fffb11bdb0ac6331f62d49df6ecf6f0a37dad Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 8 Nov 2024 11:32:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/controller/OrganizationController.java  | 8 ++++++++
 .../com/gxwebsoft/common/system/entity/Organization.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
index db56ae4..b42e8f8 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/OrganizationController.java
@@ -3,15 +3,23 @@ package com.gxwebsoft.common.system.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.web.*;
+import com.gxwebsoft.common.system.entity.FileRecord;
 import com.gxwebsoft.common.system.entity.Organization;
 import com.gxwebsoft.common.system.param.OrganizationParam;
 import com.gxwebsoft.common.system.service.OrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.xssf.streaming.SXSSFRow;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
index ccf50f5..b67d243 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
@@ -78,7 +78,7 @@ public class Organization implements Serializable {
     private String business;
 
     @ApiModelProperty(value = "经营状态")
-    private Integer businessStatus;
+    private String businessStatus;
 
     @ApiModelProperty(value = "参保人数")
     private Integer insureds;