lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

master
徐杰盟 2024-05-23 15:29:51 +08:00
parent b489f15b60
commit 3a04721234
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/whdc/controller/OrganizationController.java
View File

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

4
src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.whdc.mapper.AdinfoMapper;
import com.whdc.model.entity.Adinfo; import com.whdc.model.entity.Adinfo;
import com.whdc.model.vo.AdcdTree; import com.whdc.model.vo.AdcdTree;
import com.whdc.service.IAdinfoService; import com.whdc.service.IAdinfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -22,6 +23,7 @@ import java.util.stream.Collectors;
* @author xusan * @author xusan
* @date 2024-05-11 * @date 2024-05-11
*/ */
@Slf4j
@Service @Service
public class AdinfoServiceImpl extends ServiceImpl<AdinfoMapper, Adinfo> implements IAdinfoService { 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); adcd = adcd.substring(0,2);
} }
if (StringUtils.isNotBlank(adcd) && StringUtils.isNotBlank(adnm)) { if (StringUtils.isNotBlank(adcd) && StringUtils.isNotBlank(adnm)) {
log.info("行政区划: " + adcd + "-" + adnm);
// 需要查出层级数据 // 需要查出层级数据
return baseMapper.selectByCdOrNm(adcd, adnm); return baseMapper.selectByCdOrNm(adcd, adnm);