申领物料弹窗库存显示按照区域过滤

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmUserCategoryServiceImpl.java

@@ -173,6 +173,14 @@ public class KeyDmUserCategoryServiceImpl {
     @ApiOperation(value = "查询办公用品列表", desc = "分页查询办公用品")
     public Page<Map<String, Object>> selectMaterialList(Page<Map<String, Object>> map) {
         if (map == null) map = new Page<>();
+        Map<String, Object> user = (Map<String, Object>) map.getParams().get("_user");
+        map.getParams().put("user", user);
+        // 获取应用机构代码
+        if (user != null) {
+            Map<String, String> pos = DataScopeUtil.getPosition(user);
+            map.getParams().put("areaId", pos.get("area_id"));
+            map.getParams().put("parentIds", user.get("parent_ids")+","+pos.get("area_id"));
+        }
         return commonService.findPage(namespace + "selectMaterialList", map);
     }
 

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmUserCategoryDao.xml

@@ -345,9 +345,11 @@
             m.update_by,
             m.update_time,
             m.order_no,
-            c.category_name AS category_name
+            c.category_name AS category_name,
+            (COALESCE(i.total_quantity,0) - COALESCE(i.borrowed_quantity) - COALESCE(i.damaged_quantity)) as available_quantity
         FROM jl_key_dm_material m
         LEFT JOIN jl_key_dm_material_category c ON c.id = m.category_id
+        left join jl_key_dm_inventory as i on i.material_id = m.id
         <where>
             AND m.is_used = 1
             <if test="params.material_name != null and params.material_name != ''">
@@ -359,6 +361,9 @@
             <if test="params.category_id != null and params.category_id != ''">
                 AND m.category_id = #{params.category_id}
             </if>
+            <if test="params.areaId != null and params.areaId != ''">
+                AND i.apply_dep_code = #{params.areaId}
+            </if>
         </where>
         ORDER BY c.order_no,m.order_no ASC, m.create_time DESC
     </select>