From e86240c57c718a853d471ac79d9c59b405a8beba Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Fri, 29 Dec 2023 13:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml     | 11 ++++++-----
 .../hzims/basic/service/impl/PresonManagementServiceImpl.java |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml
index da2837d..7f145fa 100644
--- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml
+++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/mapper/PersonManagemetMapper.xml
@@ -28,11 +28,12 @@
     <select id="getPersonManagemetEntity" resultMap="PersonManagemetMap">
         select a.id ,a.name,a.unit_name ,a.sex,a.job ,a.academic_title,a.phone ,a.CREATE_TIME,
                 b.id as certificatetId,b.person_id,b.type,b.dead_time,b.pic,b.CREATE_TIME,b.status,b.create_dept,
-        case when b.dead_time &lt; NOW() then "过期" else "未过期" end as isDead
+        case when b.dead_time is null  then ""
+            when b.dead_time &lt; NOW() then "过期" else "未过期" end as isDead
         from hzims_person_managemet as a
         left join hzims_certificatet as b
-        on a.id=b.person_id
-        where a.is_deleted = 0 and b.is_deleted = 0
+        on a.id=b.person_id and b.is_deleted = 0
+        where a.is_deleted = 0
         <if test="type != null and type != ''">
             and b.type = #{type}
         </if>
@@ -64,8 +65,8 @@
         select count(*)
         from hzims_person_managemet as a
         left join hzims_certificatet as b
-        on a.id=b.person_id
-        where a.is_deleted = 0 and b.is_deleted = 0
+        on a.id=b.person_id and b.is_deleted = 0
+        where a.is_deleted = 0
         <if test="type != null and type != ''">
             and b.type = #{type}
         </if>
diff --git a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java
index 1149df8..4bfb77d 100644
--- a/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java
+++ b/hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/service/impl/PresonManagementServiceImpl.java
@@ -45,10 +45,10 @@ public class PresonManagementServiceImpl extends BaseServiceImpl<PersonManagemet
     public IPage<PersonManagemetVo> getPersonManagemetEntity(PersonManagemetVo personManagemetVo, Query query) {
         List<PersonManagemetVo> personManagemetEntity = baseMapper.getPersonManagemetEntity(personManagemetVo.getType(), personManagemetVo.getDeadStartTime(), personManagemetVo.getDeadTime(),
                 personManagemetVo.getName(), personManagemetVo.getUnitName(), personManagemetVo.getSex(), personManagemetVo.getJob(),
-                personManagemetVo.getAcademicTitle(), personManagemetVo.getStatus(), query.getCurrent(), query.getSize());
+                personManagemetVo.getAcademicTitle(), personManagemetVo.getStatus(), (query.getCurrent()-1)*query.getSize(), query.getSize());
         Integer count = baseMapper.getCountByPersonManagemetEntity(personManagemetVo.getType(), personManagemetVo.getDeadStartTime(), personManagemetVo.getDeadTime(),
                 personManagemetVo.getName(), personManagemetVo.getUnitName(), personManagemetVo.getSex(), personManagemetVo.getJob(),
-                personManagemetVo.getAcademicTitle(), personManagemetVo.getStatus(), query.getCurrent(), query.getSize());
+                personManagemetVo.getAcademicTitle(), personManagemetVo.getStatus(), (query.getCurrent()-1)*query.getSize(), query.getSize());
         IPage<PersonManagemetVo> res = new Page<>();
         res.setCurrent(query.getCurrent());
         res.setSize(query.getSize());