diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
index cfd0cb96..9fa146d5 100644
--- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
+++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
@@ -7,7 +7,6 @@ import com.nflg.mobilebroken.common.constant.STATE;
 import com.nflg.mobilebroken.common.constant.UserState;
 import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
-import com.nflg.mobilebroken.common.util.SaTokenAdminUtil;
 import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
 import com.nflg.mobilebroken.common.util.VUtils;
 import com.nflg.mobilebroken.repository.entity.AppUser;
@@ -54,7 +53,7 @@ public class AppController extends ControllerBase {
                 .setExtra("isPrimary", user.getIsPrimary()));
         user.setLastLoginTime(LocalDateTime.now());
         appUserService.updateById(user);
-        SaTokenInfo tokenInfo = SaTokenAdminUtil.getTokenInfo();
+        SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
         return ApiResult.success(new AppLoginVO()
                 .setToken(tokenInfo.getTokenValue())
                 .setExpire(tokenInfo.getTokenTimeout())
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/MenuAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/MenuAddRequest.java
index 003973b3..64920f1a 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/MenuAddRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/MenuAddRequest.java
@@ -17,7 +17,6 @@ public class MenuAddRequest {
     private String name;
 
     // 菜单组件
-    @NotEmpty
     private String component;
 
     // 菜单地址
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/MenuVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/MenuVO.java
index 014d720d..3d9e044c 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/MenuVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/MenuVO.java
@@ -24,10 +24,10 @@ public class MenuVO {
     private String url;
 
     // 是否启用
-    private boolean enable;
+    private Boolean enable;
 
     // 是否显示
-    private boolean show;
+    private Boolean show;
 
     // 排序
     private int sort;
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java
index d2fd7bf7..4fe6b61e 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java
@@ -28,7 +28,7 @@ public interface TicketMapper extends BaseMapper<Ticket> {
 
     IPage<AdminTicketVO> searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage<?> page);
 
-    void completeTicket(List<Integer> ids, Integer userId);
+//    void completeTicket(List<Integer> ids, Integer userId);
 
     List<AdminTicketVO> searchAllFromAdmin(AdminTicketSearchRequest request);
 
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
index 8528439a..2c080f60 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
@@ -21,9 +21,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>
@@ -110,7 +108,34 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
 
     @Override
     public void completeTicket(List<Integer> ids) {
-        baseMapper.completeTicket(ids, AdminUserUtil.getUserId());
+//        baseMapper.completeTicket(ids, AdminUserUtil.getUserId());
+        List<Ticket> tickets=listByIds(ids);
+        List<String> stateErrors=new ArrayList<>();
+        List<String> handleErrors=new ArrayList<>();
+        for (Ticket ticket : tickets) {
+            if (!Objects.equals(ticket.getState(), TicketState.Processing.getState())){
+                stateErrors.add(ticket.getTitle());
+            }else if(Arrays.stream(ticket.getHandle().split(","))
+                    .noneMatch(uid->StrUtil.equals(uid, AdminUserUtil.getUserId().toString()))
+            ){
+                handleErrors.add(ticket.getTitle());
+            }
+        }
+        StringBuilder sb=new StringBuilder();
+        if (!stateErrors.isEmpty()){
+            sb.append("以下工单状态不允许完成:").append(StrUtil.join(",", stateErrors));
+        }
+        if (!handleErrors.isEmpty()){
+            sb.append("以下工单你无权操作:").append(StrUtil.join(",", handleErrors));
+        }
+        String msg=sb.toString();
+        VUtils.trueThrowBusinessError(StrUtil.isNotBlank(msg))
+                .throwMessage(msg);
+        lambdaUpdate()
+                .in(Ticket::getId, ids)
+                .set(Ticket::getState, TicketState.ProcessingCompleted.getState())
+                .set(Ticket::getUpdateTime, LocalDateTime.now())
+                .update();
     }
 
     @Override
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminRoleMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminRoleMapper.xml
index 984353a1..2d384cfe 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminRoleMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminRoleMapper.xml
@@ -25,7 +25,7 @@
     </select>
 
     <select id="getMenusByRoleCodes" resultType="com.nflg.mobilebroken.common.pojo.vo.MenuVO">
-        SELECT DISTINCT m.`name`,m.url
+        SELECT DISTINCT m.id,m.`name`,m.url,m.component
         FROM admin_role r
                  INNER JOIN admin_role_menu_map rmm ON r.id=rmm.role_id
                  INNER JOIN admin_menu m ON rmm.menu_id=m.id
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
index a05f91cd..a2ae80d6 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
@@ -122,14 +122,14 @@
         ORDER BY t.create_time DESC
     </select>
 
-    <select id="completeTicket">
-        UPDATE ticket
-        SET state=2,update_time=NOW()
-        WHERE state=1 AND FIND_IN_SET(#{userId},handle)>0 AND id IN
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </select>
+<!--    <select id="completeTicket">-->
+<!--        UPDATE ticket-->
+<!--        SET state=2,update_time=NOW()-->
+<!--        WHERE state=1 AND FIND_IN_SET(#{userId},handle)>0 AND id IN-->
+<!--        <foreach collection="ids" item="id" open="(" separator="," close=")">-->
+<!--            #{id}-->
+<!--        </foreach>-->
+<!--    </select>-->
 
     <select id="searchAllFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution,a.`name` AS 'areaName'