客户资料修改

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -82,9 +82,6 @@
         <if test="CorpsDesc.goodtypes!=null and CorpsDesc.goodtypes != ''">
             and goodtypes like CONCAT(CONCAT('%', #{CorpsDesc.goodtypes}), '%')
         </if>
-        <if test="CorpsDesc.belongtocompany!=null and CorpsDesc.belongtocompany != ''">
-            and belongtocompany like CONCAT(CONCAT('%',  #{CorpsDesc.belongtocompany}), '%')
-        </if>
         <if test="CorpsDesc.companytype!=null and CorpsDesc.companytype != ''">
             and companytype = #{CorpsDesc.companytype}
         </if>
@@ -148,7 +145,7 @@
         </if>
         <if test="CorpsDesc.belongtocompany!=null and CorpsDesc.belongtocompany != ''">
             and (belongtocompany = #{CorpsDesc.belongtocompany}
-            or admin_profiles IS NULL)
+            or belongtocompany IS NULL)
         </if>
         <if test="CorpsDesc.creditGrant!=null">
             and credit_grant = #{CorpsDesc.creditGrant}

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -160,9 +160,7 @@ public class GoodsDescController extends BladeController {
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
 		if (StringUtils.isNotEmpty(artsVision)){
-			goodsDescLambdaQueryWrapper.eq(GoodsDesc::getArtsVision,artsVision);
-			goodsDescLambdaQueryWrapper.or();
-			goodsDescLambdaQueryWrapper.isNull(GoodsDesc::getArtsVision);
+			goodsDescLambdaQueryWrapper.and(i -> i.eq(GoodsDesc::getArtsVision,artsVision).or().isNull(GoodsDesc::getArtsVision));
 		}
 		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page = new Page<>(current, size);