From 3b5a5f09be6aaed9c6aded33ff823482a6cc5fcf Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 13 Apr 2023 14:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E9=80=89?= =?UTF-8?q?=E5=88=99=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 8 +++++ .../service/RoleService.java | 11 ++++++ .../service/impl/RoleServiceImpl.java | 25 +++++++++++++- .../application-out.html | 34 +++++++++++++++++-- 4 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 592d4902..533f0acc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -13,6 +13,7 @@ import com.dreamchaser.depository_manage.security.bean.UserToken; import com.dreamchaser.depository_manage.security.pool.AuthenticationTokenPool; import com.dreamchaser.depository_manage.service.*; import com.dreamchaser.depository_manage.utils.*; +import org.apache.commons.collections4.CollectionUtils; import org.apache.http.protocol.HTTP; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -728,6 +729,13 @@ public class PageController { if (role == null) { role = 1; } + // 获取当前用户是否存在可见仓库 + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + if(union.size() > 0){ + mv.addObject("display","block"); + }else{ + mv.addObject("display","none"); + } mv.setViewName("pages/application/application-out"); if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4, role) == 0) { mv.setViewName("pages/applicationForStorageCenter/application-out"); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java b/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java index 3291ba8d..64ad97ca 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java @@ -1,6 +1,7 @@ package com.dreamchaser.depository_manage.service; import com.dreamchaser.depository_manage.entity.Role; +import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.pojo.RoleAndDepository; import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType; @@ -176,4 +177,14 @@ public interface RoleService { */ List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map); + + /** + * 用于查询当前用户所被赋予的可见仓库 + * @param userToken 待查询用户 + * @return + */ + List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken); + + + } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java index da9fa1ab..77c1f089 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java @@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.service.impl; import com.dreamchaser.depository_manage.entity.Depository; import com.dreamchaser.depository_manage.entity.MaterialType; +import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.mapper.DepositoryMapper; import com.dreamchaser.depository_manage.mapper.MaterialTypeMapper; @@ -10,6 +11,7 @@ import com.dreamchaser.depository_manage.pojo.RoleAndDepository; import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType; import com.dreamchaser.depository_manage.service.RoleService; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -385,12 +387,33 @@ public class RoleServiceImpl implements RoleService { } else if ("post".equals(type)) { // 如果是对岗位赋权 map.put("type", 2); - } else { + } + else { throw new MyException("未知参数错误"); } return roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(map); } + /** + * 用于查询当前用户所被赋予的可见仓库 + * @param userToken 待查询用户 + * @return + */ + @Override + public List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken) { + Map paramForFindDepositoryId = new HashMap<>(); + paramForFindDepositoryId.put("type",1); + paramForFindDepositoryId.put("uid",userToken.getId()); + // 查询该用户是否存在单独设置的仓库 + List depositoryIdListForPerson = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); + paramForFindDepositoryId.put("type",2); + paramForFindDepositoryId.put("uid",userToken.getPosition()); + // 查询该用户职位是否存在设计的仓库 + List depositoryIdListForPost = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); + // 取并集 + return (List) CollectionUtils.union(depositoryIdListForPerson, depositoryIdListForPost); + } + /** * 获取当前仓库的子仓库 diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html index 2861aebf..94967262 100644 --- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html @@ -176,6 +176,14 @@ +
+ +
+ +
+
@@ -462,13 +470,14 @@ element = layui.element, step = layui.step; + let depositoryDisplay = $("#depositoryId").css("display"); // 用于分步表单加载 step.render({ elem: '#stepForm', filter: 'stepForm', width: '100%', //设置容器宽度 - height: '700px', + height: '750px', stepItems: [{ title: '填写信息' }, { @@ -680,6 +689,14 @@
+
+
+
+ +
+
@@ -695,7 +712,12 @@ // 获取当前高度 var height = parseInt(($("#stepForm").css('height')).split("px")[0]); params.push(NewIdNumber); - $("#stepForm").css("height", height + 387 + 'px'); + if (depositoryDisplay === "none") { + $("#stepForm").css("height", height + 387 + 'px'); + } else { + $("#stepForm").css("height", height + 435 + 'px'); + + } $("#" + parentId).after(materialItem); }; @@ -837,7 +859,13 @@ // 获取祖父节点 var reparent = parent.parentNode; var height = parseInt(($("#stepForm").css('height')).split("px")[0]); - $("#stepForm").css("height", height - 387 + 'px'); + if (depositoryDisplay === "none") { + + $("#stepForm").css("height", height - 387 + 'px'); + } else { + $("#stepForm").css("height", height - 435 + 'px'); + + } params = remove(params, parentId); reparent.removeChild(parent); };