通讯录查询修改

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

@@ -4,8 +4,11 @@ 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;
 import com.whdc.model.group.Update;
+import com.whdc.model.vo.AdcdTree;
+import com.whdc.model.vo.FcCommVo;
 import com.whdc.service.IOrganizationService;
 import com.whdc.utils.ResultJson;
 import io.swagger.annotations.Api;
@@ -17,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -36,11 +41,73 @@ public class OrganizationController {
 
     @ApiOperation(value = "查询所有")
     @PostMapping(value = "find")
-    public ResultJson<Organization> find() {
-        return ResultJson.ok(service.findByUserId(String.valueOf(StpUtil.getLoginId())));
+    public ResultJson<FcCommVo> find() {
+        List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()));
+        return ResultJson.ok(findFcCommVo(organizations));
 
     }
 
+    private List<FcCommVo> findFcCommVo(List<Organization> organizations){
+        ArrayList<FcCommVo> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(organizations)){
+            return list;
+        }
+
+        for (Organization o : organizations) {
+            FcCommVo fcCommVo = new FcCommVo();
+            List<AdcdTree> adinfoList = o.getAdinfoList();
+            fcCommVo.setAdinfo(findAdcdTree(adinfoList));
+            List<UnitDict> unitDicts = o.getUnitDicts();
+            fcCommVo.setUds(findUds(unitDicts));
+            fcCommVo.setId(String.valueOf(o.getId()))
+                    .setName(o.getName())
+                    .setSort(o.getSort())
+                    .setFsort(o.getFsort())
+                    .setFcid(o.getFcid())
+                    .setType("2");
+            list.add(fcCommVo);
+        }
+
+        return list;
+    }
+    private List<FcCommVo> findAdcdTree(List<AdcdTree> adinfoList){
+
+        ArrayList<FcCommVo> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(adinfoList)){
+            return list;
+        }
+        for (AdcdTree o : adinfoList) {
+            FcCommVo fcCommVo = new FcCommVo();
+            fcCommVo.setId(o.getAdcd())
+                    .setName(o.getAdnm())
+                    .setAdlevel(o.getAdlevel())
+                    .setType("4");
+            fcCommVo.setAdinfo(findAdcdTree(o.getAdcdChildren()));
+            list.add(fcCommVo);
+        }
+
+        return list;
+    }
+
+    private List<FcCommVo> findUds(List<UnitDict> unitDicts){
+        ArrayList<FcCommVo> list = new ArrayList<>();
+        if (CollectionUtils.isEmpty(unitDicts)){
+            return list;
+        }
+        for (UnitDict o : unitDicts) {
+            FcCommVo fcCommVo = new FcCommVo();
+            fcCommVo.setId(String.valueOf(o.getId()))
+            .setName(o.getName())
+            .setSort(o.getSort())
+            .setFsort(o.getFsort())
+            .setFcid(o.getFcid())
+            .setType("3");
+            list.add(fcCommVo);
+        }
+
+        return list;
+    }
+
 //    @ApiOperation(value = "分页查询")
 //    @PostMapping(value = "page")
     public ResultJson<Organization> page(@RequestBody Organization dto) {

src/main/java/com/whdc/model/vo/FcCommVo.java

@@ -0,0 +1,57 @@
+package com.whdc.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.whdc.model.entity.AddressBook;
+import com.whdc.model.group.Find;
+import com.whdc.model.group.Insert;
+import com.whdc.model.group.Update;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Author xusan
+ * @Date 2024/5/13 10:17
+ * @Notes
+ **/
+@Data
+@Accessors(chain = true)
+@ApiModel(description = "置顶")
+public class FcCommVo {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "序号")
+    private Integer sort;
+
+    @ApiModelProperty(value = "置顶排序")
+    private Integer fsort;
+
+    @ApiModelProperty(value = "置顶id")
+    private Integer fcid;
+
+    @ApiModelProperty(value = "置顶类型 2: 组织 3: 单位 4:行政区划")
+    private String type;
+
+    @ApiModelProperty(value = "行政区划级别 0省,1市,2县,3镇,4村,5组 ,(点击树查询下级, 点击查询按钮查询本级)", example = "0")
+    private Integer adlevel;
+
+    @ApiModelProperty(value = "行政区划")
+    List<FcCommVo> adinfo;
+
+    @ApiModelProperty(value = "单位")
+    List<FcCommVo> uds;
+
+}