修改审计的问题。
This commit is contained in:
parent
9bd93c68bc
commit
5cc05e1820
|
|
@ -27,10 +27,7 @@ import com.electromagnetic.industry.software.manage.service.UserAccessLogService
|
|||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
|
|
@ -75,14 +72,22 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
|
|||
}
|
||||
|
||||
if (StrUtil.isNotEmpty(pars.getKeyWord())) {
|
||||
Set<String> operationObjSet = new HashSet<>();
|
||||
Set<String> userIdSet = userMapper.selectList(Wrappers.<User>lambdaQuery().select(User::getId).like(User::getUserName, pars.getKeyWord())).stream().map(User::getId).collect(Collectors.toSet());
|
||||
for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
|
||||
if (e.desc.contains(pars.getKeyWord())){
|
||||
operationObjSet.add(e.key);
|
||||
}
|
||||
}
|
||||
|
||||
queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord())
|
||||
// .or()
|
||||
// .like(UserAccessLog::getRequestUrl, pars.getKeyWord())
|
||||
.or()
|
||||
.in(CollUtil.isNotEmpty(operationObjSet), UserAccessLog::getOperationModule, operationObjSet)
|
||||
.or()
|
||||
.in(CollUtil.isNotEmpty(userIdSet), UserAccessLog::getUserId, userIdSet)
|
||||
.or()
|
||||
.like(UserAccessLog::getRequestIp, pars.getKeyWord())
|
||||
.or()
|
||||
.like(UserAccessLog::getRemoteAddr, pars.getKeyWord())
|
||||
.or()
|
||||
.like(UserAccessLog::getOperationMsg, pars.getKeyWord()));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue