ci:持续修改

cjl

2023-09-27 57b29a43e4d1505d44e1ac82ed61ef640ba49e8c

 screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java

@@ -10,13 +10,9 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

import java.util.List;
import java.util.Map;
import java.util.Objects;

import javax.servlet.http.HttpServletRequest;

/**
 * <p>
@@ -34,16 +30,14 @@

    @Override
    public Page<UserLog> selectLogs(Map<String, Object> parameters) {
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        String token = request.getHeader("token");
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
        Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
        Object orgId = orgInfo.get("id");
        QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("organization_id", orgId);
        Object type = parameters.get("type");
        if (type != null) {
            queryWrapper.eq("type", type);
        List<Object> types = (List<Object>) parameters.get("types");
        if (!types.isEmpty()) {
            queryWrapper.in("type", types);
        }
        queryWrapper.orderByDesc("create_time");
        Integer page = (Integer) parameters.get("page");