Browse Source

申购、待采购、已采购页面数据隔离

yzc 2 years ago
parent
commit
517dd49cf0

+ 3 - 1
hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -219,7 +219,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         if (ObjectUtil.isNotEmpty(permissionList)) {
             //if当前用户的角色 in [运营专员, 运营助理] 页面仅展示产品.管理部门 == 当前用户所在部门的相关数据
             if (permissionList.contains("E-commerce operation") || permissionList.contains("Operation assistant")) {
-                wrapper.eq("json_unquote( pi.victoriatourist_json -> '$.deptId' )", SecurityUtils.getDeptId());
+                Long userDeptId = SecurityUtils.getDeptId();
+                String userDeptIdStr = ObjectUtil.isNotEmpty(userDeptId) ? userDeptId.toString() : "";
+                wrapper.eq("json_unquote( pi.victoriatourist_json -> '$.deptId' )", userDeptIdStr);
             }
         }
 

+ 3 - 1
hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -159,7 +159,9 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         if (ObjectUtil.isNotEmpty(permissionList)) {
             //if当前用户的角色 in [运营专员, 运营助理] 页面仅展示产品.管理部门 == 当前用户所在部门的相关数据
             if (permissionList.contains("E-commerce operation") || permissionList.contains("Operation assistant")) {
-                wrapper.eq("json_unquote( pi.victoriatourist_json -> '$.deptId' )", SecurityUtils.getDeptId());
+                Long userDeptId = SecurityUtils.getDeptId();
+                String userDeptIdStr = ObjectUtil.isNotEmpty(userDeptId) ? userDeptId.toString() : "";
+                wrapper.eq("json_unquote( pi.victoriatourist_json -> '$.deptId' )", userDeptIdStr);
             }
         }