修改水价，属性，去掉站点id

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/BaseWaterPropertyServiceImpl.java

@@ -158,8 +158,7 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
         basePriceOfWaterProperty.setCreateDate(LocalDateTime.now());
         basePriceOfWaterProperty.setUpdateBy(BigInteger.valueOf(loginUser.getId()));
         basePriceOfWaterProperty.setUpdateDate(LocalDateTime.now());
-        basePriceOfWaterProperty.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
-        basePriceOfWaterProperty.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
+
         basePriceOfWaterProperty.setDelFlag("0");
         basePriceOfWaterProperty.setWaterPropertyId(id);
 

zoniot-pay/zoniot-pay-web/src/main/java/com/zcxk/rmcp/pay/service/impl/pay/PayBaseWaterpriceServiceImpl.java

@@ -121,11 +121,10 @@ public class PayBaseWaterpriceServiceImpl implements PayBaseWaterpriceService {
     public int edit(PayBaseWaterprice payBaseWaterprice)
     {
         LoginUser loginUser = UserUtil.getCurrentUser();
-        BigInteger siteId =  new BigInteger(String.valueOf(loginUser.getSiteId()));
-        BigInteger customerId = new BigInteger(String.valueOf(loginUser.getCustomerId()));
+
 
         //是否已使用
-        int useCount = payBaseWaterpriceMapper.isUsed(payBaseWaterprice.getId(),siteId,customerId);
+        int useCount = payBaseWaterpriceMapper.isUsed(payBaseWaterprice.getId(),null,null);
         if(useCount > 0)
             throw new ServiceException(-717,"该用水价格已被应用，无法编辑。");