客户bug修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -115,8 +115,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 		if (StringUtils.isNotBlank(query.getModelName())) {
 			qw.like("modelName", query.getModelName());
 		}
-		qw.eq("createBySid",query.getUserSid());
 		qw.eq("useOrgSid",query.getUseOrgSid());
+		qw.eq("createBySid",query.getUserSid());
+//		qw.eq("createBySid",query.getUserSid());
 		return qw;
 	}
 	

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -354,7 +354,11 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
         entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
         entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
-        entity.setVehicleModelOffer(appCrmVehicleDemandUpdateDto.getPrice());
+        if (StringUtils.isNotBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
+            entity.setVehicleModelOffer(appCrmVehicleDemandUpdateDto.getPrice());
+        } else {
+            entity.setVehicleModelOffer("0.00");
+        }
         baseMapper.updateById(entity);
         return rb.success();
     }