添加查询接口字段

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java

@@ -148,6 +148,7 @@ public class ConfigServiceDirectiveDto implements Serializable {
      * 即时指令图标
      */
     private String immediateFile;
+    private String netImmediateFile;
     /**
      * 即时指令焦点图标
      */

nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -91,6 +91,7 @@ public class ShiroConfig {
         }
         filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
+//        filterChainDefinitionMap.put("/nuIpadApi/nuBizNuCustomerServer/**", "anon"); //服务指令测试
         filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调
         filterChainDefinitionMap.put("/api/pad/baseInfo/**", "anon"); //电表回调
         filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml

@@ -31,7 +31,7 @@
     <select id="getWarehouseInfoList" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory">
         select b.category_id,b.type_id,b.medication_id from nu_warehouse_material_info a
         left join nu_config_material_info b on a.wl_id = b.id
-        where a.nu_id = #{params.nuId} GROUP BY b.category_id,b.type_id,b.medication_id
+        where a.nu_id = #{params.nuId} and a.del_flag = 0 and a.iz_enabled = 0 GROUP BY b.category_id,b.type_id,b.medication_id
     </select>
 
     <select id="getCgdMaterialTreeData" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory">