src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -52,7 +52,9 @@ secureRegistry.excludePathPatterns("/swagger-resources/**"); secureRegistry.excludePathPatterns("/druid/**"); secureRegistry.excludePathPatterns("/farmPlant/**"); secureRegistry.excludePathPatterns("/land/land/**"); secureRegistry.excludePathPatterns("/farmPlant/**"); secureRegistry.excludePathPatterns("/soldr/soldr/**"); secureRegistry.excludePathPatterns("/stockrecord/stockrecord/**"); secureRegistry.excludePathPatterns("/blade-resource/oss/endpoint/**"); return secureRegistry; } src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -42,11 +42,17 @@ LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1 LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_val1 WHERE CODE = 'stockSpecs1' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''"> AND blade_dict_biz.tenant_id = #{soldr.codes} </if>) d ON d.dict_key = st.specs_val1 LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_val2 LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''"> AND blade_dict_biz.tenant_id = #{soldr.codes} </if>) c ON c.dict_key = st.specs_val2 LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''"> AND blade_dict_biz.tenant_id = #{soldr.codes} </if>) a ON a.dict_key = stf.type WHERE st.is_deleted = 0 <if test="soldr.stype!=null and soldr.stype != ''"> src/main/java/org/springblade/modules/soldr/vo/SoldrVO.java
@@ -38,4 +38,5 @@ String spn; String agrname; Integer cnum; String codes; } src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -42,11 +42,19 @@ LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_value1 WHERE CODE = 'stockSpecs1' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) d ON d.dict_key = st.specs_value1 LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_value2 LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) c ON c.dict_key = st.specs_value2 LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''"> AND blade_dict_biz.tenant_id = #{stock.codes} </if>) a ON a.dict_key = stf.type WHERE st.is_deleted = 0 and state=0 <if test="stock.stype!=null and stock.stype != ''"> src/main/java/org/springblade/modules/stock/vo/StockVO.java
@@ -37,5 +37,6 @@ String spn; String agrname; Integer cnum; String codes; } src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -60,19 +60,25 @@ stf.factory_name AS factoryName, d.dict_value AS dic1, c.dict_value AS dic2, a.name as czr a.name as czr, f.agricultural_name as agrname FROM `sys_stockrecord` st LEFT JOIN sys_stockfactory stf ON st.stock_id1 = stf.id LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE `code` = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_val1 WHERE code ='stockSpecs1' AND is_deleted = 0 <if test="stockrecord.codes!=null and stockrecord.codes != ''"> AND blade_dict_biz.tenant_id = #{stockrecord.codes} </if>) d ON d.dict_key = st.specs_val1 LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE `code` = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_val2 WHERE code ='stockSpecs2' AND is_deleted = 0 <if test="stockrecord.codes!=null and stockrecord.codes != ''"> AND blade_dict_biz.tenant_id = #{stockrecord.codes} </if>) c ON c.dict_key = st.specs_val2 LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1 WHERE st.is_deleted = 0 <if test="stockrecord.stype!=null and stockrecord.stype != ''"> and stf.type = #{stockrecord.stype} src/main/java/org/springblade/modules/stockrecord/vo/StockrecordVO.java
@@ -38,4 +38,6 @@ String spn; String czr; String count; String codes; String agrname; }