diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index d3c8aa7..aa47cff 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -83,7 +83,8 @@
     OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"),
     UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"),
     USER_ID_EMPTY(2432, "用户id不能为空"),
-    CLIENT_ID_EMPTY(2433, "用户id不能为空");
+    CLIENT_ID_EMPTY(2433, "用户id不能为空"),
+    URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办");
 
     private Integer code;
     private String message;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index d3c8aa7..aa47cff 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -83,7 +83,8 @@
     OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"),
     UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"),
     USER_ID_EMPTY(2432, "用户id不能为空"),
-    CLIENT_ID_EMPTY(2433, "用户id不能为空");
+    CLIENT_ID_EMPTY(2433, "用户id不能为空"),
+    URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index e12bad0..cfddc29 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -165,11 +165,11 @@
                 page.setCurrent(1);
                 page.setSearchCount(false);
                 page.setSize(Integer.MAX_VALUE);
-                setSiteExecuteLogRequestEmpty(request);
                 // 获取列表
                 Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage =this.siteExecutiveLogListPage(page,request);
                 siteExecutiveLogList = siteExecutiveLogListPage.getRecords();
             } else {
+                setSiteExecuteLogRequestEmpty(request);
                 siteExecutiveLogList = this.listByIds(request.getIds());
             }
             for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index d3c8aa7..aa47cff 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -83,7 +83,8 @@
     OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"),
     UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"),
     USER_ID_EMPTY(2432, "用户id不能为空"),
-    CLIENT_ID_EMPTY(2433, "用户id不能为空");
+    CLIENT_ID_EMPTY(2433, "用户id不能为空"),
+    URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index e12bad0..cfddc29 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -165,11 +165,11 @@
                 page.setCurrent(1);
                 page.setSearchCount(false);
                 page.setSize(Integer.MAX_VALUE);
-                setSiteExecuteLogRequestEmpty(request);
                 // 获取列表
                 Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage =this.siteExecutiveLogListPage(page,request);
                 siteExecutiveLogList = siteExecutiveLogListPage.getRecords();
             } else {
+                setSiteExecuteLogRequestEmpty(request);
                 siteExecutiveLogList = this.listByIds(request.getIds());
             }
             for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d84792c..ad81deb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -321,6 +321,9 @@
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
+            if(ObjectUtils.isEmpty(meterStaff)){
+                throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY);
+            }
             QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
             wrapper.eq("account", meterStaff.getAccount());
             UserInfo userInfo = userInfoMapper.selectOne(wrapper);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index d3c8aa7..aa47cff 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -83,7 +83,8 @@
     OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"),
     UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"),
     USER_ID_EMPTY(2432, "用户id不能为空"),
-    CLIENT_ID_EMPTY(2433, "用户id不能为空");
+    CLIENT_ID_EMPTY(2433, "用户id不能为空"),
+    URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index e12bad0..cfddc29 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -165,11 +165,11 @@
                 page.setCurrent(1);
                 page.setSearchCount(false);
                 page.setSize(Integer.MAX_VALUE);
-                setSiteExecuteLogRequestEmpty(request);
                 // 获取列表
                 Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage =this.siteExecutiveLogListPage(page,request);
                 siteExecutiveLogList = siteExecutiveLogListPage.getRecords();
             } else {
+                setSiteExecuteLogRequestEmpty(request);
                 siteExecutiveLogList = this.listByIds(request.getIds());
             }
             for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d84792c..ad81deb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -321,6 +321,9 @@
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
+            if(ObjectUtils.isEmpty(meterStaff)){
+                throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY);
+            }
             QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
             wrapper.eq("account", meterStaff.getAccount());
             UserInfo userInfo = userInfoMapper.selectOne(wrapper);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
index 487e1e9..e455910 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
@@ -41,14 +41,11 @@
         Long userId = permissionService.getAuthService().getLoginUser().getId();
         UserPush userPush = initUserPush(userId, clientid);
         UserPush old = this.baseMapper.getPushByUserId(userId, userPush.getType());
-        int updateOrAddFlag = 0;
-        if (!ObjectUtil.isEmpty(old)) {
-            userPush.setId(old.getId());
-            updateOrAddFlag = this.baseMapper.updateById(userPush);
-        } else {
-            updateOrAddFlag = this.baseMapper.insert(userPush);
+        int addFlag = 0;
+        if (ObjectUtil.isEmpty(old)) {
+            addFlag = this.baseMapper.insert(userPush);
         }
-        if (updateOrAddFlag > 0) {
+        if (addFlag > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -102,7 +99,7 @@
     private PushUserMessage pushToUserTemplate(WorkbenchRemindMessage remindMessage) {
         PushUserMessage pushUserMessage = new PushUserMessage();
         List<Long> userIds=new ArrayList<>();
-        if (remindMessage.getRemindId().equals(remindMessage.getRemindDeptId())) {
+        if ("部门检测".equals(remindMessage.getMessageTopic())) {
             userIds.addAll(this.baseMapper.getUserIdsByDeptId(remindMessage.getRemindDeptId()));
         } else {
             userIds.add(remindMessage.getRemindId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 8cb272d..7e556cb 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "dtt";
+            username = "cz";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index d3c8aa7..aa47cff 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -83,7 +83,8 @@
     OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"),
     UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"),
     USER_ID_EMPTY(2432, "用户id不能为空"),
-    CLIENT_ID_EMPTY(2433, "用户id不能为空");
+    CLIENT_ID_EMPTY(2433, "用户id不能为空"),
+    URGER_IS_EMPTY(2434, "催办人不存在或被删除，无法催办");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index e12bad0..cfddc29 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -165,11 +165,11 @@
                 page.setCurrent(1);
                 page.setSearchCount(false);
                 page.setSize(Integer.MAX_VALUE);
-                setSiteExecuteLogRequestEmpty(request);
                 // 获取列表
                 Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage =this.siteExecutiveLogListPage(page,request);
                 siteExecutiveLogList = siteExecutiveLogListPage.getRecords();
             } else {
+                setSiteExecuteLogRequestEmpty(request);
                 siteExecutiveLogList = this.listByIds(request.getIds());
             }
             for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d84792c..ad81deb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -321,6 +321,9 @@
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
+            if(ObjectUtils.isEmpty(meterStaff)){
+                throw new BusinessException(BusinessExceptionEnum.URGER_IS_EMPTY);
+            }
             QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
             wrapper.eq("account", meterStaff.getAccount());
             UserInfo userInfo = userInfoMapper.selectOne(wrapper);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
index 487e1e9..e455910 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/MessagePushServiceImpl.java
@@ -41,14 +41,11 @@
         Long userId = permissionService.getAuthService().getLoginUser().getId();
         UserPush userPush = initUserPush(userId, clientid);
         UserPush old = this.baseMapper.getPushByUserId(userId, userPush.getType());
-        int updateOrAddFlag = 0;
-        if (!ObjectUtil.isEmpty(old)) {
-            userPush.setId(old.getId());
-            updateOrAddFlag = this.baseMapper.updateById(userPush);
-        } else {
-            updateOrAddFlag = this.baseMapper.insert(userPush);
+        int addFlag = 0;
+        if (ObjectUtil.isEmpty(old)) {
+            addFlag = this.baseMapper.insert(userPush);
         }
-        if (updateOrAddFlag > 0) {
+        if (addFlag > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -102,7 +99,7 @@
     private PushUserMessage pushToUserTemplate(WorkbenchRemindMessage remindMessage) {
         PushUserMessage pushUserMessage = new PushUserMessage();
         List<Long> userIds=new ArrayList<>();
-        if (remindMessage.getRemindId().equals(remindMessage.getRemindDeptId())) {
+        if ("部门检测".equals(remindMessage.getMessageTopic())) {
             userIds.addAll(this.baseMapper.getUserIdsByDeptId(remindMessage.getRemindDeptId()));
         } else {
             userIds.add(remindMessage.getRemindId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java
index b7fafdb..9c27572 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchRemindMessageServiceImpl.java
@@ -60,7 +60,7 @@
         wrapper.eq(!Objects.isNull(request.getRemindDeptId()), "remind_dept_id", request.getRemindDeptId());
         wrapper.eq(StringUtils.isNotBlank(request.getMessageType()), "message_type", request.getMessageType());
         wrapper.eq(StringUtils.isNotBlank(request.getMessageSourceModule()), "message_source_module", request.getMessageSourceModule());
-        wrapper.eq(Objects.isNull(request.getStatus()),"status", request.getStatus());
+        wrapper.eq(!Objects.isNull(request.getStatus()),"status", request.getStatus());
         wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),