src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -54,6 +54,7 @@ secureRegistry.excludePathPatterns("/farmPlant/**"); secureRegistry.excludePathPatterns("/land/land/**"); secureRegistry.excludePathPatterns("/farmPlant/**"); secureRegistry.excludePathPatterns("/soldrecord/soldrecord/**"); secureRegistry.excludePathPatterns("/soldr/soldr/**"); secureRegistry.excludePathPatterns("/stockrecord/stockrecord/**"); secureRegistry.excludePathPatterns("/blade-resource/oss/endpoint/**"); src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -38,6 +38,15 @@ <if test="land.landName!=null and land.landName != ''"> and l.land_name like concat('%', #{land.landName},'%') </if> <if test="land.deptId!=null and land.deptId != ''"> and l.dept_id like concat('%', #{land.deptId},'%') </if> <if test="land.type!=null and land.type != ''"> and l.type like concat('%', #{land.type},'%') </if> <if test="land.tenantId!=null and land.tenantId != ''"> and l.tenant_id like concat('%', #{land.tenantId},'%') </if> </select> <insert id="saveLandInfo"> src/main/java/org/springblade/modules/lang/vo/LandVO.java
@@ -33,5 +33,6 @@ String dic; String dica; String deptname; String tenantId; } src/main/java/org/springblade/modules/soldrecord/entity/Soldrecord.java
@@ -60,6 +60,7 @@ */ private Integer specsVal2; private String type; private Long sid; } src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
@@ -97,7 +97,7 @@ LEFT JOIN ( SELECT id, real_name FROM blade_user ) f ON f.id=st.create_user WHERE st.is_deleted = 0 <if test="soldrecord.stockId1!=null and soldrecord.stockId1 != ''"> and st.stock_id1 = #{soldrecord.stockId1} and st.sid= #{soldrecord.stockId1} </if> </select> src/main/java/org/springblade/modules/soldrecord/vo/SoldrecordVO.java
@@ -39,4 +39,5 @@ String agrname; Integer cnum; String codes; String username; } src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -200,6 +200,7 @@ soldrecord.setSpecsVal1(stockrecord.getSpecsVal1()); soldrecord.setSpecsVal2(stockrecord.getSpecsVal2()); soldrecord.setType(stockrecord.getType1()); soldrecord.setSid(stockrecord.getSid()); String type1 = stockrecord.getType1(); if (type1.equals("0")) { //已出库农资数量记录