Merge branch 'dongj' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into dongj

service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml

@@ -14,6 +14,7 @@
         SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code}
         <if test="type != null and type != ''"> and csourcetype = #{type} </if> and dr = '0'
         )
+        and dr = '0'
         <if test="cbilltypecode != null and cbilltypecode != ''"> and h.cbilltypecode = #{cbilltypecode} </if>
         group by h.vbillcode,a.unitcode
     </select>