|
@@ -2,7 +2,6 @@ package com.ruoyi.business.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson2.TypeReference;
|
|
import com.alibaba.fastjson2.TypeReference;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
-import com.ruoyi.business.domain.ZwywCyrySxxx;
|
|
|
|
import com.ruoyi.business.domain.ZwywYljgSxxx;
|
|
import com.ruoyi.business.domain.ZwywYljgSxxx;
|
|
import com.ruoyi.business.mapper.ZwywLhcjNrrdMapper;
|
|
import com.ruoyi.business.mapper.ZwywLhcjNrrdMapper;
|
|
import com.ruoyi.business.mapper.ZwywYljgSxxxMapper;
|
|
import com.ruoyi.business.mapper.ZwywYljgSxxxMapper;
|
|
@@ -11,6 +10,7 @@ import com.ruoyi.common.core.constant.SecurityConstants;
|
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
import com.ruoyi.common.core.utils.uuid.IdUtils;
|
|
import com.ruoyi.common.core.utils.uuid.IdUtils;
|
|
import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
|
|
+import com.ruoyi.common.security.utils.EncryptionUtils;
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
import com.ruoyi.system.api.RemoteDictDataService;
|
|
import com.ruoyi.system.api.RemoteDictDataService;
|
|
import com.ruoyi.system.api.domain.SysDictData;
|
|
import com.ruoyi.system.api.domain.SysDictData;
|
|
@@ -90,6 +90,7 @@ public class ZwywYljgSxxxServiceImpl implements IZwywYljgSxxxService
|
|
@Override
|
|
@Override
|
|
public List<ZwywYljgSxxx> selectZwywYljgSxxxByNrrdList(ZwywYljgSxxx zwywYljgSxxx)
|
|
public List<ZwywYljgSxxx> selectZwywYljgSxxxByNrrdList(ZwywYljgSxxx zwywYljgSxxx)
|
|
{
|
|
{
|
|
|
|
+ EncryptionUtils.encryption(zwywYljgSxxx);
|
|
LambdaQueryWrapper<ZwywYljgSxxx> lqw = new LambdaQueryWrapper<ZwywYljgSxxx>()
|
|
LambdaQueryWrapper<ZwywYljgSxxx> lqw = new LambdaQueryWrapper<ZwywYljgSxxx>()
|
|
.and(l -> l.in(ZwywYljgSxxx::getLzzt, zwywYljgSxxx.getLzztList()).or().in(ZwywYljgSxxx::getInstanceId
|
|
.and(l -> l.in(ZwywYljgSxxx::getLzzt, zwywYljgSxxx.getLzztList()).or().in(ZwywYljgSxxx::getInstanceId
|
|
, zwywYljgSxxx.getInstanceIds()))
|
|
, zwywYljgSxxx.getInstanceIds()))
|