From 3345882b6bc6e453839569341407167d7369ba3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 26 Sep 2024 15:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/PlugController.java     |  6 ----
 .../common/system/entity/Organization.java    | 25 +++++++++++++
 .../system/param/OrganizationParam.java       | 35 +++++++++++++++++++
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java b/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java
index b184dcc..a5ee764 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/PlugController.java
@@ -30,8 +30,6 @@ public class PlugController extends BaseController {
     @Resource
     private PlugService plugService;
 
-    @PreAuthorize("hasAuthority('sys:plug:list')")
-    @OperationLog
     @ApiOperation("分页查询插件扩展")
     @GetMapping("/page")
     public ApiResult<PageResult<Plug>> page(PlugParam param) {
@@ -39,8 +37,6 @@ public class PlugController extends BaseController {
         return success(plugService.pageRel(param));
     }
 
-    @PreAuthorize("hasAuthority('sys:plug:list')")
-    @OperationLog
     @ApiOperation("查询全部插件扩展")
     @GetMapping()
     public ApiResult<List<Plug>> list(PlugParam param) {
@@ -48,8 +44,6 @@ public class PlugController extends BaseController {
         return success(plugService.listRel(param));
     }
 
-    @PreAuthorize("hasAuthority('sys:plug:list')")
-    @OperationLog
     @ApiOperation("根据id查询插件扩展")
     @GetMapping("/{id}")
     public ApiResult<Plug> get(@PathVariable("id") Integer id) {
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 2a8bba1..7d2c2f8 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Organization.java
@@ -2,6 +2,7 @@ package com.gxwebsoft.common.system.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.io.Serializable;
 
@@ -61,6 +62,30 @@ public class Organization implements Serializable {
     @ApiModelProperty(value = "园区介绍")
     private String about;
 
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "企业邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "成立时间")
+    private Date establishTime;
+
+    @ApiModelProperty(value = "注册资金")
+    private BigDecimal registeredCapital;
+
+    @ApiModelProperty(value = "经营范围")
+    private String business;
+
+    @ApiModelProperty(value = "经营状态")
+    private Integer businessStatus;
+
+    @ApiModelProperty(value = "参保人数")
+    private Integer insureds;
+
+    @ApiModelProperty(value = "所属行业")
+    private String industry;
+
     @ApiModelProperty(value = "负责人id")
     private Integer leaderId;
 
diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
index 55286f7..0252f60 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
@@ -10,6 +10,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 组织机构查询参数
  *
@@ -71,6 +74,38 @@ public class OrganizationParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private String about;
 
+    @ApiModelProperty(value = "联系电话")
+    @QueryField(type = QueryType.EQ)
+    private String phone;
+
+    @ApiModelProperty(value = "企业邮箱")
+    @QueryField(type = QueryType.EQ)
+    private String email;
+
+    @ApiModelProperty(value = "成立时间")
+    @QueryField(type = QueryType.EQ)
+    private Date establishTime;
+
+    @ApiModelProperty(value = "注册资金")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal registeredCapital;
+
+    @ApiModelProperty(value = "经营范围")
+    @QueryField(type = QueryType.EQ)
+    private String business;
+
+    @ApiModelProperty(value = "经营状态")
+    @QueryField(type = QueryType.EQ)
+    private Integer businessStatus;
+
+    @ApiModelProperty(value = "参保人数")
+    @QueryField(type = QueryType.EQ)
+    private Integer insureds;
+
+    @ApiModelProperty(value = "所属行业")
+    @QueryField(type = QueryType.EQ)
+    private String industry;
+
     @ApiModelProperty(value = "负责人id")
     @QueryField(type = QueryType.EQ)
     private Integer leaderId;