diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 1f024dd5..8d3b344e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -139,6 +139,7 @@ public interface TmTaskMapper { int getDeptId(String createBy); List getLeaseOutListByjjbz(TmTask task); + List getLeaseOutListByAdmin(TmTask task); int updateLeaseAuditListByOne(TmTask task); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 20efbf19..6b078259 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -598,7 +598,9 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseOutListByUser(TmTask task) { Set roles = SecurityUtils.getLoginUser().getRoles(); - if (roles.contains("jjbz") || roles.contains("fbz")) { + if (roles.contains("admin")){ + return tmTaskMapper.getLeaseOutListByAdmin(task); + } else if (roles.contains("jjbz") || roles.contains("fbz")) { //机具班长和副班长可以出库机具设备 return tmTaskMapper.getLeaseOutListByjjbz(task); } else { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 23b32229..043e85ea 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1059,9 +1059,7 @@ LEFT JOIN lease_apply_details lad on lai.id = lad.parennt_id LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id WHERE tt.task_status in(33,34,35) - - and mtk.user_id = #{userId} - + and mtk.user_id = #{userId} and tt.code like concat('%', #{code}, '%') @@ -1292,4 +1290,48 @@ GROUP BY lad.type_id +