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 implements Serializable { @ApiModelProperty(value = "置顶排序序号") private Integer fsort; + @TableField(exist = false) + @ApiModelProperty(value = "置顶id") + private Integer fcid; + @TableField(exist = false) @ApiModelProperty(value = "单位") private List 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 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 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 @@