From 7bf2e41c581c3dca6235986735b29a988fe46c6f Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Tue, 25 Mar 2025 21:55:35 +0800
Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/odboy/modules/system/mapper/JobMapper.java   | 9 ++-------
 .../modules/system/service/impl/JobServiceImpl.java      | 8 ++++----
 .../src/main/resources/mapper/JobMapper.xml              | 5 ++++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/JobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/JobMapper.java
index a11db25e..aeda1246 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/JobMapper.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/JobMapper.java
@@ -13,11 +13,6 @@ import java.util.List;
 
 @Mapper
 public interface JobMapper extends BaseMapper<Job> {
-
-    @Select("select id from sys_job where name = #{name}")
-    Job selectByName(@Param("name") String name);
-
-    List<Job> selectByPage(@Param("criteria") JobQueryCriteria criteria);
-
-    IPage<Job> selectByPage(@Param("criteria") JobQueryCriteria criteria, Page<Object> page);
+    Job findJobByName(@Param("name") String name);
+    IPage<Job> findJobPage(@Param("criteria") JobQueryCriteria criteria, Page<Object> page);
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java
index 9b85596f..aff9d4d4 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java
@@ -32,12 +32,12 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
 
     @Override
     public PageResult<Job> queryAll(JobQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(jobMapper.selectByPage(criteria, page));
+        return PageUtil.toPage(jobMapper.findJobPage(criteria, page));
     }
 
     @Override
     public List<Job> queryAll(JobQueryCriteria criteria) {
-        return jobMapper.selectByPage(criteria);
+        return jobMapper.findJobPage(criteria, PageUtil.getCount(jobMapper)).getRecords();
     }
 
     @Override
@@ -54,7 +54,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(Job resources) {
-        Job job = jobMapper.selectByName(resources.getName());
+        Job job = jobMapper.findJobByName(resources.getName());
         if (job != null) {
             throw new EntityExistException(Job.class, "name", resources.getName());
         }
@@ -65,7 +65,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
     @Transactional(rollbackFor = Exception.class)
     public void update(Job resources) {
         Job job = getById(resources.getId());
-        Job old = jobMapper.selectByName(resources.getName());
+        Job old = jobMapper.findJobByName(resources.getName());
         if (old != null && !old.getId().equals(resources.getId())) {
             throw new EntityExistException(Job.class, "name", resources.getName());
         }
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml
index 0ed2ba49..f924f36c 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/JobMapper.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.modules.system.mapper.JobMapper">
-    <select id="selectByPage" resultType="cn.odboy.model.system.domain.Job">
+    <select id="findJobByName" resultType="cn.odboy.model.system.domain.Job">
+        select id from sys_job where name = #{name}
+    </select>
+    <select id="findJobPage" resultType="cn.odboy.model.system.domain.Job">
         select
         *
         from sys_job