diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolApplyController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolApplyController.java
index 4361ccb..bebb20e 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolApplyController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolApplyController.java
@@ -142,7 +142,7 @@ public class ToolApplyController extends BaseController
                 toolApplyService.updateToolApply(updateStatus);
             }
             //办结
-            if(RecordStatusEnum.DONE.getCode().equals(toolApply)){
+            if(RecordStatusEnum.DONE.getCode().equals(toolApply.getRecordStatus())){
                 //给消息中心发送消息
                 toolApplyService.sendTzMessage(toolApply);
             }
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
index e244f87..cc80bc7 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
@@ -71,7 +71,7 @@ public class ToolController extends BaseController
         //前端传传参开启下载权限验证
         if (BooleanUtil.isTrue(tool.getDownloadCheck())) {
             String userId = SecurityUtils.getUserId().toString();
-            for (Tool vo:list) {
+            for (Tool vo : list) {
                 //创建人、下载权限、系统管理员
                 //1.已经审核通过、并且有下载权限
                 vo.setDownloadStatus(
@@ -80,6 +80,12 @@ public class ToolController extends BaseController
                                 SecurityUtils.hasPermi(Constants.DOWNLOAD_TOOL_PERMISSION) ||
                                 ( RecordStatusEnum.DONE.getCode().equals(vo.getRecordStatus())&&
                         iToolApplyService.checkToolApply(vo.getToolId(),userId)));
+
+                ToolApply toolApply = new ToolApply();
+                toolApply.setToolId(vo.getToolId());
+                toolApply.setUserId(userId);
+                List<ToolApply> hasApplyUsToolApplyList = iToolApplyService.selectToolApplyList(toolApply);
+                vo.setIsHasApplyUse(hasApplyUsToolApplyList.size() > 0);
             }
         }
         return getDataTable(list);
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
index ad5856b..a0aefe5 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
@@ -97,6 +97,8 @@ public class Tool extends BaseEntity
 
     private Boolean downloadStatus;
 
+    private Boolean isHasApplyUse;
+
     private List<String> excludeFields;
 
     private List<Document> documentList;
diff --git a/tool-tech-system/src/main/resources/mapper/system/SysUserMapper.xml b/tool-tech-system/src/main/resources/mapper/system/SysUserMapper.xml
index 628dce5..786ebfb 100644
--- a/tool-tech-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/tool-tech-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -66,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>