代码提交

sql/data.sql

@@ -1,6 +1,6 @@
  SET IDENTITY_INSERT FXKH_TXL.ORGANIZATION ON;
 insert into "FXKH_TXL"."ORGANIZATION"("ID", "NAME") VALUES
-    ('1','省防指' ),
+
     ('2','省防办' ),
     ('3','省防指成员单位' ),
     ('4','市、县防指、防办' ),

sql/dm_start.sql

@@ -6,6 +6,7 @@ CREATE TABLE "FXKH_TXL"."ADDRESS_BOOK"
     "TEL" VARCHAR(50),
     "FAXES" VARCHAR(50),
     "ORGANIZATION" VARCHAR(50),
+    "RESPONSIBILITY" VARCHAR(50),
     "POSITION" VARCHAR(200),
     "COMMENTS" VARCHAR(200),
     "URL" VARCHAR(200),
@@ -24,6 +25,7 @@ COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."ORGANIZATION" IS '组织';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."PHONE" IS '手机号';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."ADCD" IS '行政区划';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."POSITION" IS '职务';
+COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."RESPONSIBILITY" IS '职责';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."SORT" IS '序号';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."TEL" IS '电话';
 COMMENT ON COLUMN "FXKH_TXL"."ADDRESS_BOOK"."URL" IS '图片路径';

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

@@ -2,6 +2,7 @@ package com.whdc.controller;
 
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.whdc.model.dto.AdcdDto;
 import com.whdc.model.entity.Organization;
 import com.whdc.model.entity.UnitDict;
 import com.whdc.model.group.Insert;
@@ -39,8 +40,8 @@ public class OrganizationController {
 
     @ApiOperation(value = "查询所有")
     @PostMapping(value = "find")
-    public ResultJson<FcCommVo> find() {
+    public ResultJson<FcCommVo> find(@RequestBody AdcdDto dto) {
-        List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()));
+        List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),dto.getAdcd());
         return ResultJson.ok(findFcCommVo(organizations));
 
     }

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

@@ -0,0 +1,18 @@
+package com.whdc.model.dto;
+
+import com.whdc.model.group.Find;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author xusan
+ * @date 2023年3月20日08:57:22
+ */
+@Data
+public class AdcdDto {
+
+    @ApiModelProperty(value = "行政区划编号")
+    private String adcd;
+}

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

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author 李赛
@@ -40,4 +39,7 @@ public class LoginVo implements Serializable {
 
     @ApiModelProperty(value = "行政区划级别 0省,1市,2县,3镇,4村,5组 ,(点击树查询下级, 点击查询按钮查询本级)", example = "0")
     private Integer adlevel;
+
+    @ApiModelProperty(value = "行政区划编码")
+    private String adcd;
 }

src/main/java/com/whdc/service/IOrganizationService.java

@@ -21,5 +21,5 @@ public interface IOrganizationService extends IService<Organization> {
     // 获取所有规则
     List<Organization> find(Organization dto);
 
-    List<Organization> findByUserId(String userId);
+    List<Organization> findByUserId(String userId,String adcd);
 }

src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java

@@ -47,7 +47,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
 
 
     @Override
-    public List<Organization> findByUserId(String userId) {
+    public List<Organization> findByUserId(String userId,String adcd) {
         List<Organization> organizations = baseMapper.findByUserId(userId);
 
         List<UnitDict> list = unitDictService.findByUserId(userId);
@@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
             organization.setUnitDicts(unitDicts);
             String name = organization.getName();
             if (name.contains("市") && name.contains("县")){
-                organization.setAdinfoList(adinfoService.tree(null, null));
+                organization.setAdinfoList(adinfoService.tree(adcd, null));
             }
         });
 

src/main/java/com/whdc/service/impl/UserServiceImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.whdc.exception.MyException;
 import com.whdc.mapper.AddressBookMapper;
 import com.whdc.mapper.UserMapper;
@@ -15,12 +15,11 @@ import com.whdc.model.entity.AddressBook;
 import com.whdc.model.entity.User;
 import com.whdc.model.vo.LoginVo;
 import com.whdc.service.IUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.whdc.utils.HttpUtil;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import com.whdc.utils.ResultJson;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,11 +27,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
-import java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Random;
-import java.util.Objects;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static com.whdc.model.MyConstant.REDIS_KEY;
@@ -87,6 +82,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             if (Objects.nonNull(book)){
                 String adcd = book.getAdcd();
                 if (StringUtils.isNotBlank(adcd)) {
+                    out.setAdcd(adcd);
                     if ("00000000000".equals(adcd.substring(4))) { // 市
                         out.setAdlevel(1);
 
@@ -198,6 +194,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         BeanUtils.copyProperties(sysUser, out);
         String adcd = addressBook.getAdcd();
         if (StringUtils.isNotBlank(adcd)) {
+            out.setAdcd(adcd);
             if ("00000000000".equals(adcd.substring(4))) { // 市
                 out.setAdlevel(1);
 

src/main/resources/mapper/OrganizationMapper.xml

@@ -19,6 +19,7 @@
             ORGANIZATION O
                 LEFT JOIN FC F ON F.AB_ID = O.ID AND F.USER_ID = #{userId}
 
+        ORDER BY O.ID
     </select>
 
 </mapper>