diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
index 49cd4d04..7c1bfde6 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
@@ -386,7 +386,7 @@ public class TicketController extends ControllerBase {
     }
 
     private TicketEvaluateVO getTicketEvaluate(Integer ticketId) {
-        TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId);
+        TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one();
         if (Objects.isNull(ticketEvaluate)) {
             return null;
         }
diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
index bc223b24..835e9136 100644
--- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
+++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
@@ -221,7 +221,7 @@ public class TiketController extends ControllerBase {
     }
 
     private TicketEvaluateVO getTicketEvaluate(Integer ticketId) {
-        TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId);
+        TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one();
         if (Objects.isNull(ticketEvaluate)) {
             return null;
         }
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java
index 5e98f62e..23ff62f7 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.common.pojo.vo;
 
+import com.nflg.mobilebroken.common.constant.MessageSubType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -20,9 +21,16 @@ public class AppMessageVO {
     //工单标题
     private String ticketTitle;
 
-    //提醒事项
+    //任务事项，5：工单新消息；6：工单完成；10：工单超时
+    private Integer subType;
+
+    //任务事项描述
     private String content;
 
+    public String getContent() {
+        return MessageSubType.findByValue(subType).getDescription();
+    }
+
     //消息时间
     private LocalDateTime createTime;
 
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
index a6738c14..b2f97f0b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
@@ -369,7 +369,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                     .setUserName(d.getUserName())
                     .setCompanyName(company.getAgencyCompanyName())
                     .setLanguageCode(d.getLanguageCode())
-                    .setName(d.getSalesUserName())
+                    .setName(d.getUserName())
                     .setEmail(d.getUserEmail())
                     .setSalesUserName(d.getSalesUserName())
                     .setAreaName(area.getName())
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java
index e5d75575..e64ff75d 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java
@@ -105,6 +105,9 @@ public class DictionaryItemServiceImpl extends ServiceImpl<DictionaryItemMapper,
             List<DictionaryItemTranslate> forAdd = new ArrayList<>();
             List<DictionaryItemTranslate> forUpdate = new ArrayList<>();
             for (TranslateMap translate : request.getLanguages()) {
+                if(StrUtil.isBlank(translate.getValue())){
+                    continue;
+                }
                 DictionaryItemTranslate t = new DictionaryItemTranslate()
                         .setDictionaryItemId(id)
                         .setLanguageCode(translate.getCode())
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml
index 1ae86be3..084e0a12 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.AppMessageMapper">
 
     <select id="getNotReadMessage" resultType="com.nflg.mobilebroken.common.pojo.vo.AppMessageVO">
-        SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',t.title AS 'ticketTitle',m.content,m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
+        SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',m.sub_type AS 'subType',t.title AS 'ticketTitle',m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
         FROM app_message m
                  INNER JOIN ticket t ON m.ticket_id=t.id
                  INNER JOIN app_user u ON t.user_id=u.id
@@ -11,7 +11,7 @@
         ORDER BY m.create_time DESC
     </select>
     <select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AppMessageVO">
-        SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',t.title AS 'ticketTitle',m.content,m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
+        SELECT m.id,t.id AS 'ticketId',t.`no` AS 'ticketNo',m.sub_type AS 'subType',t.title AS 'ticketTitle',m.create_time AS 'createTime',u.`name` AS 'ticketCreateBy',t.create_time AS 'ticketCreateTime',t.handle AS 'ticketHandleBy',m.is_read AS 'isRead'
         FROM app_message m
         INNER JOIN ticket t ON m.ticket_id=t.id
         INNER JOIN app_user u ON t.user_id=u.id
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index 9b546e57..78938c49 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -82,7 +82,7 @@
         INNER JOIN app_area a ON u.area_id=a.id
         LEFT JOIN app_user uc ON u.create_by=uc.id
         LEFT JOIN t_base_position p ON u.title_id=p.id
-        WHERE u.company_id=#{companyId}
+        WHERE u.state=0 AND u.company_id=#{companyId}
         <if test="state > 0">
             AND 1=2
         </if>