From 20048bdffe5e87469f8d6382480d19ab00318eb2 Mon Sep 17 00:00:00 2001
From: Xusan <1105644308@QQ.COM>
Date: Thu, 16 May 2024 10:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/whdc/model/entity/Organization.java | 4 ++++
 src/main/java/com/whdc/model/entity/UnitDict.java     | 5 +++++
 src/main/java/com/whdc/model/vo/AddressBookVo.java    | 4 ++++
 src/main/resources/mapper/AddressBookMapper.xml       | 2 +-
 src/main/resources/mapper/OrganizationMapper.xml      | 2 +-
 src/main/resources/mapper/UnitDictMapper.xml          | 2 +-
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whdc/model/entity/Organization.java b/src/main/java/com/whdc/model/entity/Organization.java
index 03966d5..4ebcf34 100644
--- a/src/main/java/com/whdc/model/entity/Organization.java
+++ b/src/main/java/com/whdc/model/entity/Organization.java
@@ -56,6 +56,10 @@ public class Organization extends Model<Organization> implements Serializable {
     @ApiModelProperty(value = "置顶排序序号")
     private Integer fsort;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "置顶id")
+    private Integer fcid;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "单位")
     private List<UnitDict> unitDicts;
diff --git a/src/main/java/com/whdc/model/entity/UnitDict.java b/src/main/java/com/whdc/model/entity/UnitDict.java
index 3b83e46..66c79a4 100644
--- a/src/main/java/com/whdc/model/entity/UnitDict.java
+++ b/src/main/java/com/whdc/model/entity/UnitDict.java
@@ -56,4 +56,9 @@ public class UnitDict extends Model<UnitDict> implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "置顶排序")
     private Integer fsort;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "置顶id")
+    private Integer fcid;
 }
\ No newline at end of file
diff --git a/src/main/java/com/whdc/model/vo/AddressBookVo.java b/src/main/java/com/whdc/model/vo/AddressBookVo.java
index 7c5e2e2..bcde883 100644
--- a/src/main/java/com/whdc/model/vo/AddressBookVo.java
+++ b/src/main/java/com/whdc/model/vo/AddressBookVo.java
@@ -23,4 +23,8 @@ public class AddressBookVo extends AddressBook{
     @TableField(exist = false)
     @ApiModelProperty(value = "常用联系人置顶联系人序号")
     private Integer fsort;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "常用联系人id")
+    private Integer fcid;
 }
diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml
index 2f36677..3bcbe8a 100644
--- a/src/main/resources/mapper/AddressBookMapper.xml
+++ b/src/main/resources/mapper/AddressBookMapper.xml
@@ -5,7 +5,7 @@
 
     <select id="page" resultType="com.whdc.model.vo.AddressBookVo">
         SELECT
-            AB.*,F.SORT FSORT
+            AB.*,F.SORT FSORT,F.ID FCID
         FROM
             ADDRESS_BOOK AB
         LEFT JOIN FC F ON F.AB_ID = AB.ID AND F.USER_ID = #{dto.userId}
diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index f98c597..0252045 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/src/main/resources/mapper/OrganizationMapper.xml
@@ -14,7 +14,7 @@
     <select id="findByUserId" resultType="com.whdc.model.entity.Organization">
         SELECT
             O.*,
-            F.SORT FSORT
+            F.SORT FSORT,F.ID FCID
         FROM
             ORGANIZATION O
                 LEFT JOIN FC F ON F.AB_ID = O.ID AND F.USER_ID = #{userId}
diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml
index 463a0be..42183cf 100644
--- a/src/main/resources/mapper/UnitDictMapper.xml
+++ b/src/main/resources/mapper/UnitDictMapper.xml
@@ -12,7 +12,7 @@
     <select id="findByUserId" resultType="com.whdc.model.entity.UnitDict">
         SELECT
         UD.*,
-        F.SORT FSORT
+        F.SORT FSORT,F.ID FCID
         FROM
         UNIT_DICT UD
         LEFT JOIN FC F ON F.AB_ID = UD.O_ID AND F.USER_ID = #{userId}