ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-v1.0 #1

Merged
panchichun merged 41 commits from release-v1.0 into main 2024-09-13 17:03:09 +08:00
Conversation 0 Commits 41 Files Changed 138 +13 -2
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c57babe9ce - Show all commits

2
tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolApplyController.java
View File

@ -142,7 +142,7 @@ public class ToolApplyController extends BaseController
toolApplyService.updateToolApply(updateStatus); toolApplyService.updateToolApply(updateStatus);
} }
//办结 //办结
if(RecordStatusEnum.DONE.getCode().equals(toolApply)){ if(RecordStatusEnum.DONE.getCode().equals(toolApply.getRecordStatus())){
//给消息中心发送消息 //给消息中心发送消息
toolApplyService.sendTzMessage(toolApply); toolApplyService.sendTzMessage(toolApply);
} }

8
tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java
View File

@ -71,7 +71,7 @@ public class ToolController extends BaseController
//前端传传参开启下载权限验证 //前端传传参开启下载权限验证
if (BooleanUtil.isTrue(tool.getDownloadCheck())) { if (BooleanUtil.isTrue(tool.getDownloadCheck())) {
String userId = SecurityUtils.getUserId().toString(); String userId = SecurityUtils.getUserId().toString();
for (Tool vo:list) { for (Tool vo : list) {
//创建人、下载权限、系统管理员 //创建人、下载权限、系统管理员
//1.已经审核通过、并且有下载权限 //1.已经审核通过、并且有下载权限
vo.setDownloadStatus( vo.setDownloadStatus(
@ -80,6 +80,12 @@ public class ToolController extends BaseController
SecurityUtils.hasPermi(Constants.DOWNLOAD_TOOL_PERMISSION) || SecurityUtils.hasPermi(Constants.DOWNLOAD_TOOL_PERMISSION) ||
( RecordStatusEnum.DONE.getCode().equals(vo.getRecordStatus())&& ( RecordStatusEnum.DONE.getCode().equals(vo.getRecordStatus())&&
iToolApplyService.checkToolApply(vo.getToolId(),userId))); 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); return getDataTable(list);

2
tool-tech-admin/src/main/java/com/rzdata/web/domain/Tool.java
View File

@ -97,6 +97,8 @@ public class Tool extends BaseEntity
private Boolean downloadStatus; private Boolean downloadStatus;
private Boolean isHasApplyUse;
private List<String> excludeFields; private List<String> excludeFields;
private List<Document> documentList; private List<Document> documentList;

3
tool-tech-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -66,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{userName}, '%')
</if> </if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
</if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND u.status = #{status} AND u.status = #{status}
</if> </if>