通讯录查询修改

sql/data.sql

@@ -1,5 +1,4 @@
-insert into "FXKH_TXL"."ORGANIZATION"("OBJ_ID", "NAME")
+insert into "FXKH_TXL"."ORGANIZATION"("ID", "NAME") VALUES
-VALUES
     ('1','省防指' ),
     ('2','省防办' ),
     ('3','省防指成员单位' ),
@@ -9,13 +8,16 @@ VALUES
     ('7','主要蓄滞洪区' ),
     ('8','大型水库大坝' );
 
-insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION")
+insert into "FXKH_TXL"."ADDRESS_BOOK"("NAME", "PHONE", "ORGANIZATION", "POSITION") VALUES
-VALUES ('超级管理员','18891233883','1','巡视员')
+('超级管理员','18891233883','1','巡视员')
 ,('政区管理员','18891233883','2','巡视员')
 ,('普通用户','18891233883','3','巡视员');
 
-insert into "FXKH_TXL"."UNIT_DICT"("NAME","O_ID")
+insert into "FXKH_TXL"."AB_UD_R"("AD_ID", "DICT_ID", "TYPE") VALUES
-VALUES ('省水利厅','省水利厅')
+('','','');
+
+insert into "FXKH_TXL"."UNIT_DICT"("NAME","O_ID") VALUES
+    ('省水利厅','省水利厅')
 ,('省水利厅','省财政厅')
 ,('省公安厅','省公安厅');
 

sql/dm_start.sql

@@ -67,6 +67,7 @@ COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."OBJ_ID" IS '编号';
 COMMENT ON COLUMN "FXKH_TXL"."ORGANIZATION"."SORT" IS '序号';
 
 
+
 CREATE TABLE "FXKH_TXL"."AB_UD_R"
 (
     "AD_ID" INTEGER,
@@ -143,7 +144,7 @@ CREATE TABLE "FXKH_TXL"."AB_INFO"
     "TYPE" CHAR(1) DEFAULT 0,
     NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
 
-COMMENT ON TABLE "FXKH_TXL"."AB_INFO" IS '通讯录日志';
+COMMENT ON TABLE "FXKH_TXL"."AB_INFO" IS '通讯录操作日志';
 COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."AB_ID" IS '通讯录编号';
 COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_ID" IS '新增人id';
 COMMENT ON COLUMN "FXKH_TXL"."AB_INFO"."CREATE_TIME" IS '新增时间';

src/main/java/com/whdc/controller/AddressBookController.java

@@ -61,7 +61,7 @@ public class AddressBookController {
     @ApiOperation(value = "分页查询")
     @PostMapping(value = "page")
     public ResultJson<AddressBook> page(@RequestBody AddressBootDto dto) {
-
+        dto.setUserId(String.valueOf(StpUtil.getLoginId()));
         return ResultJson.ok(service.page(dto));
 
     }

src/main/java/com/whdc/model/dto/AddressBootDto.java

@@ -18,4 +18,7 @@ public class AddressBootDto extends CommDto{
 
     @ApiModelProperty(value = "行政区划")
     private String adcd;
+
+    @ApiModelProperty(value = "登录用户id")
+    private String userId;
 }

src/main/java/com/whdc/model/entity/AddressBook.java

@@ -85,4 +85,8 @@ public class AddressBook extends Model<AddressBook> implements Serializable {
     @ApiModelProperty(value = "创建人id")
     private String createId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "置顶序号")
+    private String fsort;
+
 }

src/main/resources/mapper/AddressBookMapper.xml

@@ -5,10 +5,11 @@
 
     <select id="page" resultType="com.whdc.model.entity.AddressBook">
         SELECT
-            AB.*
+            AB.*,F.SORT FSORT
         FROM
-            AB_UD_R R
+            ADDRESS_BOOK AB
-        LEFT JOIN ADDRESS_BOOK AB ON R.AD_ID = AB.ID
+        LEFT JOIN FC F ON F.AB_ID = AB.ID
+        LEFT JOIN AB_UD_R R ON R.AD_ID = AB.ID
         WHERE 1=1
         <if test="dto.dictId != null and dto.dictId != '' ">
             AND R.DICT_ID = #{dto.dictId}
@@ -25,6 +26,9 @@
         <if test="dto.phone != null and dto.phone != '' ">
             AND AB.PHONE = #{dto.phone}
         </if>
+        <if test="dto.userId != null and dto.userId != ''">
+            AND F.USER_ID = #{dto.userId}
+        </if>
         ORDER BY AB.SORT
     </select>