|
|
@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import jnpf.entity.AreaEntity;
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
import jnpf.model.QueryModel;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
|
import jnpf.base.model.ColumnDataModel;
|
|
|
@ -277,6 +279,7 @@ public class ParkServiceImpl extends ServiceImpl<ParkMapper, ParkEntity> impleme
|
|
|
|
form.setCode(form.getCode().trim());
|
|
|
|
form.setCode(form.getCode().trim());
|
|
|
|
QueryWrapper<ParkEntity> codeWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<ParkEntity> codeWrapper = new QueryWrapper<>();
|
|
|
|
codeWrapper.lambda().eq(ParkEntity::getCode, form.getCode());
|
|
|
|
codeWrapper.lambda().eq(ParkEntity::getCode, form.getCode());
|
|
|
|
|
|
|
|
codeWrapper.lambda().eq(ParkEntity::getType,"1");
|
|
|
|
//假删除标志
|
|
|
|
//假删除标志
|
|
|
|
codeWrapper.lambda().isNull(ParkEntity::getDeleteMark);
|
|
|
|
codeWrapper.lambda().isNull(ParkEntity::getDeleteMark);
|
|
|
|
if (isUp) {
|
|
|
|
if (isUp) {
|
|
|
|