|
|
@@ -2,6 +2,7 @@ package com.ruoyi.gljt.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.ruoyi.common.core.utils.DateUtils;
|
|
|
+import com.ruoyi.common.core.utils.StringUtils;
|
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
|
import com.ruoyi.gljt.domain.GljtTzgg;
|
|
|
import com.ruoyi.gljt.mapper.GljtTzggMapper;
|
|
|
@@ -56,8 +57,9 @@ public class GljtTzggServiceImpl implements IGljtTzggService
|
|
|
@Override
|
|
|
public List<GljtTzgg> selectGljtTzggList(GljtTzgg gljtTzgg)
|
|
|
{
|
|
|
+ String filter = StringUtils.isEmpty(gljtTzgg.getXzqh()) ? SecurityUtils.getAreaCode() : gljtTzgg.getXzqh();
|
|
|
List<GljtTzgg> res = gljtTzggMapper.selectList(new LambdaQueryWrapper<>(gljtTzgg)
|
|
|
- .likeRight(GljtTzgg::getXzqh, SubCodeUtil.code2Short(SecurityUtils.getAreaCode())));
|
|
|
+ .likeRight(GljtTzgg::getXzqh, SubCodeUtil.code2Short(filter)));
|
|
|
res.forEach(r -> {
|
|
|
r.setXzqhCode(sysDeptJlMapper.getXzqhCodes(r.getXzqh()));
|
|
|
r.setXzqhName(sysDeptJlMapper.getXzqhNames(r.getXzqh()));
|
