diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index 45f08e5..34473c6 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -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 records = pagination.find(sql, ids); if (records == null || records.isEmpty()) { diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 0bd9498..8e8dc4d 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -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); } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index a26a8ab..6990191 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -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)>