diff --git a/src/main/java/com/whdc/controller/OrganizationController.java b/src/main/java/com/whdc/controller/OrganizationController.java index 3e3d0cf..b3ee078 100644 --- a/src/main/java/com/whdc/controller/OrganizationController.java +++ b/src/main/java/com/whdc/controller/OrganizationController.java @@ -1,8 +1,8 @@ package com.whdc.controller; +import cn.dev33.satoken.context.SaHolder; 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; @@ -40,8 +40,8 @@ public class OrganizationController { @ApiOperation(value = "查询所有") @PostMapping(value = "find") - public ResultJson find(@RequestBody AdcdDto dto) { - List organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),dto.getAdcd()); + public ResultJson find() { + List organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),String.valueOf(SaHolder.getStorage().get("adcd"))); return ResultJson.ok(findFcCommVo(organizations)); } diff --git a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java index e444e39..97eb065 100644 --- a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java @@ -8,6 +8,7 @@ import com.whdc.mapper.AdinfoMapper; import com.whdc.model.entity.Adinfo; import com.whdc.model.vo.AdcdTree; import com.whdc.service.IAdinfoService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -22,6 +23,7 @@ import java.util.stream.Collectors; * @author xusan * @date 2024-05-11 */ +@Slf4j @Service public class AdinfoServiceImpl extends ServiceImpl implements IAdinfoService { @@ -103,7 +105,7 @@ public class AdinfoServiceImpl extends ServiceImpl impleme adcd = adcd.substring(0,2); } if (StringUtils.isNotBlank(adcd) && StringUtils.isNotBlank(adnm)) { - + log.info("行政区划: " + adcd + "-" + adnm); // 需要查出层级数据 return baseMapper.selectByCdOrNm(adcd, adnm);