From a870a3f92e881dc5557bcaa46f5da480eccd15da Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 16 May 2024 21:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/whdc/controller/OrganizationController.java    | 6 ++----
 src/main/java/com/whdc/model/entity/Organization.java       | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/whdc/controller/OrganizationController.java b/src/main/java/com/whdc/controller/OrganizationController.java
index ea95119..410a285 100644
--- a/src/main/java/com/whdc/controller/OrganizationController.java
+++ b/src/main/java/com/whdc/controller/OrganizationController.java
@@ -2,7 +2,6 @@ package com.whdc.controller;
 
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.whdc.model.entity.Organization;
 import com.whdc.model.entity.UnitDict;
 import com.whdc.model.group.Insert;
@@ -15,7 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -64,7 +62,7 @@ public class OrganizationController {
                     .setSort(o.getSort())
                     .setFsort(o.getFsort())
                     .setFcid(o.getFcid())
-                    .setType("2");
+                    .setType("1");
             list.add(fcCommVo);
         }
 
@@ -101,7 +99,7 @@ public class OrganizationController {
             .setSort(o.getSort())
             .setFsort(o.getFsort())
             .setFcid(o.getFcid())
-            .setType("3");
+            .setType("1");
             list.add(fcCommVo);
         }
 
diff --git a/src/main/java/com/whdc/model/entity/Organization.java b/src/main/java/com/whdc/model/entity/Organization.java
index 911b98f..175de96 100644
--- a/src/main/java/com/whdc/model/entity/Organization.java
+++ b/src/main/java/com/whdc/model/entity/Organization.java
@@ -62,7 +62,7 @@ public class Organization extends Model<Organization> implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "置顶类型")
-    private String type = "2";
+    private String type = "0";
 
     @TableField(exist = false)
     @ApiModelProperty(value = "单位")