Merge branch 'dev-hujianchun-bug' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/grainReserves/modular/businessGslrLossCollect/mapper/mapping/BusinessGslrLossCollectMapper.xml

@@ -69,7 +69,7 @@
         )
 
         <where>
-
+            a1.`status` = '1'
             <if test="grainNatureName != null and grainNatureName != ''">
                 a2.enumname like CONCAT('%', #{grainNatureName}, '%')
             </if>
@@ -80,7 +80,7 @@
             <if test="orgName != null and orgName != ''">
                 and a1.org_id in (SELECT org_id FROM org_info where org_name LIKE CONCAT('%', #{orgName}, '%'))
             </if>
-            a1.`status` = '1'
+
         </where>
 
         GROUP BY a1.id