mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-11-26 18:37:41 +08:00
parent b5e63288d8 d3781a7164
commit 710358e23c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/service/AccountService.java
View File

@ -458,7 +458,7 @@ public class AccountService {
if (roleIds == null || roleIds.isEmpty()) {
return new ArrayList<>();
}
String sql = "select u.id as id from sys_user_role ur left join sys_user u on u.id=ur.user_id where ur.role_id in (?)";
String sql = "select u.id as id from sys_user_role ur left join sys_user u on u.id=ur.user_id where ur.is_deleted=0 and ur.role_id in (?)";
String ids = String.join("", roleIds);
List<Record> records = pagination.find(sql, ids);
if (records == null || records.isEmpty()) {

3
src/main/resources/templates/admin/project_approve.ftl
View File

@ -1929,8 +1929,7 @@
success: function (data) {
if (data.status == 0) {
alert(data.msg);
var listFrom = $("#listFrom").val();
window.location.href = '${base}/project/' + listFrom;
window.location.href = window.location.href;
} else if (data.status == 1) {
alert(data.msg);
}

4
src/main/resources/templates/admin/project_list.ftl
View File

@ -208,7 +208,7 @@
<#--<@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 项目等于概算状态、概算审核为草稿和不通过状态-->
<#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
<#if list.creatorId==adminId && list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/edit?id=${list.id}'"><span
@ -228,7 +228,7 @@
<#-- </@shiro.hasPermission>
<@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 概算审核等于通过状态、预算审核不等于待审核状态、 决算审核不等于通过状态-->
<#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
<#if list.creatorId==adminId && list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/budgetEdit?id=${list.id}'"><span