opc完善

platform-dao/src/main/resources/mapper/tool/ToolLogMapper.xml

@@ -94,7 +94,7 @@
             resultType="com.platform.dao.vo.query.tool.ToolLogVO">
         select log.*, tool.name as toolName, tool.ggxh as ggxh
         from t_tool_log as log
-        Left JOIN t_tool as tool
+        LEFT JOIN t_tool as tool on tool.id = log.tool_id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-rest/src/main/java/com/platform/rest/controller/tool/ToolLogController.java

@@ -130,7 +130,7 @@ public class ToolLogController {
      */
     @GetMapping("")
     public R query(ToolLogDTO toolLogDTO) {
-        return new R<>(toolLogService.getModelListByDTO(toolLogDTO));
+        return new R<>(toolLogService.selectList(toolLogDTO));
     }
 
     /**

platform-service/src/main/java/com/platform/service/tool/ToolLogService.java

@@ -33,5 +33,12 @@ public interface ToolLogService extends IBaseService<ToolLog, ToolLogDTO> {
      */
     AbstractPageResultBean<ToolLogVO> selectPageList(ToolLogDTO record, int pageNum, int pageSize);
 
+    /**
+     * 分页查询
+     * @param record
+     * @return
+     */
+    List<ToolLogVO> selectList(ToolLogDTO record);
+
     void saveBatchToolLog(BatchToolLogDTO batchToolLogDTO);
 }

platform-service/src/main/java/com/platform/service/tool/impl/ToolLogServiceImpl.java

@@ -43,6 +43,11 @@ public class ToolLogServiceImpl extends BaseServiceImpl<ToolLogMapper, ToolLog,
         return new MyPage(mapper.selectList(record));
     }
 
+    @Override
+    public List<ToolLogVO> selectList(ToolLogDTO record) {
+        return mapper.selectList(record);
+    }
+
     @Override
     public void saveBatchToolLog(BatchToolLogDTO batchToolLogDTO) {
         if (!CollectionUtils.isEmpty(batchToolLogDTO.getToolLogDTOList())) {