代码提交
parent
b489f15b60
commit
3a04721234
|
|
@ -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<FcCommVo> find(@RequestBody AdcdDto dto) {
|
||||
List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),dto.getAdcd());
|
||||
public ResultJson<FcCommVo> find() {
|
||||
List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),String.valueOf(SaHolder.getStorage().get("adcd")));
|
||||
return ResultJson.ok(findFcCommVo(organizations));
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<AdinfoMapper, Adinfo> implements IAdinfoService {
|
||||
|
||||
|
|
@ -103,7 +105,7 @@ public class AdinfoServiceImpl extends ServiceImpl<AdinfoMapper, Adinfo> impleme
|
|||
adcd = adcd.substring(0,2);
|
||||
}
|
||||
if (StringUtils.isNotBlank(adcd) && StringUtils.isNotBlank(adnm)) {
|
||||
|
||||
log.info("行政区划: " + adcd + "-" + adnm);
|
||||
// 需要查出层级数据
|
||||
return baseMapper.selectByCdOrNm(adcd, adnm);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue