diff --git a/sql/data.sql b/sql/data.sql index c734542..3df7bd8 100644 --- a/sql/data.sql +++ b/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','市、县防指、防办' ), diff --git a/src/main/java/com/whdc/controller/OrganizationController.java b/src/main/java/com/whdc/controller/OrganizationController.java index 028d4ae..3e3d0cf 100644 --- a/src/main/java/com/whdc/controller/OrganizationController.java +++ b/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 find() { - List organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId())); + public ResultJson find(@RequestBody AdcdDto dto) { + List organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),dto.getAdcd()); return ResultJson.ok(findFcCommVo(organizations)); } diff --git a/src/main/java/com/whdc/model/dto/AdcdDto.java b/src/main/java/com/whdc/model/dto/AdcdDto.java new file mode 100644 index 0000000..0c31293 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/whdc/model/vo/LoginVo.java b/src/main/java/com/whdc/model/vo/LoginVo.java index 6b6dcff..7c0c808 100644 --- a/src/main/java/com/whdc/model/vo/LoginVo.java +++ b/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; } diff --git a/src/main/java/com/whdc/service/IOrganizationService.java b/src/main/java/com/whdc/service/IOrganizationService.java index 0b0f7a1..257a9bb 100644 --- a/src/main/java/com/whdc/service/IOrganizationService.java +++ b/src/main/java/com/whdc/service/IOrganizationService.java @@ -21,5 +21,5 @@ public interface IOrganizationService extends IService { // 获取所有规则 List find(Organization dto); - List findByUserId(String userId); + List findByUserId(String userId,String adcd); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java index 67f1ef6..178e7b6 100644 --- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java @@ -47,7 +47,7 @@ public class OrganizationServiceImpl extends ServiceImpl findByUserId(String userId) { + public List findByUserId(String userId,String adcd) { List organizations = baseMapper.findByUserId(userId); List list = unitDictService.findByUserId(userId); @@ -58,7 +58,7 @@ public class OrganizationServiceImpl extends ServiceImpl 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 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);