Merge remote-tracking branch 'origin/master'

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;
 
 /**

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;
@@ -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;
 

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