修改支付机构sql

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/BaseWaterPropertyMapper.xml

@@ -167,9 +167,9 @@
 			<if test="baseWaterPropertyDto.updateDate != null">update_date = #{baseWaterPropertyDto.updateDate},</if>
 			<if test="baseWaterPropertyDto.remarks != null">remarks = #{baseWaterPropertyDto.remarks},</if>
 			<if test="baseWaterPropertyDto.siteId != null">site_id = #{baseWaterPropertyDto.siteId},</if>
-			<if test="baseWaterPropertyDto.customerId != null">customer_id = #{baseWaterPropertyDto.customerId}</if>
-			<if test="baseWaterPropertyDto.companyOrgId != null"> company_org_id = #{baseWaterPropertyDto.companyOrgId}</if>
-			<if test="baseWaterPropertyDto.deptOrgId != null"> dept_org_id = #{baseWaterPropertyDto.deptOrgId}</if>
+			<if test="baseWaterPropertyDto.customerId != null">customer_id = #{baseWaterPropertyDto.customerId},</if>
+			<if test="baseWaterPropertyDto.companyOrgId != null"> company_org_id = #{baseWaterPropertyDto.companyOrgId},</if>
+			<if test="baseWaterPropertyDto.deptOrgId != null"> dept_org_id = #{baseWaterPropertyDto.deptOrgId},</if>
 
 		</set>
 		WHERE id = #{baseWaterPropertyDto.id}

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/PayBaseWatercategoryMapper.xml

@@ -38,9 +38,9 @@
             <if test="payBaseWatercategory.name != null"> `name` = #{payBaseWatercategory.name,jdbcType=VARCHAR},</if>
             <if test="payBaseWatercategory.remarks != null"> remarks = #{payBaseWatercategory.remarks,jdbcType = VARCHAR},</if>
             <if test="payBaseWatercategory.updateBy != null"> update_by = #{payBaseWatercategory.updateBy,jdbcType = BIGINT},</if>
-            <if test="payBaseWatercategory.updateDate != null"> update_date = #{payBaseWatercategory.updateDate,jdbcType=TIMESTAMP}</if>
-            <if test="payBaseWatercategory.companyOrgId != null"> company_org_id = #{payBaseWatercategory.companyOrgId}</if>
-            <if test="payBaseWatercategory.deptOrgId != null"> dept_org_id = #{payBaseWatercategory.deptOrgId}</if>
+            <if test="payBaseWatercategory.updateDate != null"> update_date = #{payBaseWatercategory.updateDate,jdbcType=TIMESTAMP},</if>
+            <if test="payBaseWatercategory.companyOrgId != null"> company_org_id = #{payBaseWatercategory.companyOrgId},</if>
+            <if test="payBaseWatercategory.deptOrgId != null"> dept_org_id = #{payBaseWatercategory.deptOrgId},</if>
 
         </set>
         where id=#{payBaseWatercategory.id,jdbcType=BIGINT}

zoniot-pay/zoniot-pay-core/src/main/resources/mapper/pay/PayBaseWaterpriceMapper.xml

@@ -53,9 +53,9 @@
             <if test="payBaseWaterprice.growthrate != null">growthrate=#{payBaseWaterprice.growthrate,jdbcType=DECIMAL},</if>
             <if test="payBaseWaterprice.remarks != null"> remarks = #{payBaseWaterprice.remarks,jdbcType = VARCHAR},</if>
             <if test="payBaseWaterprice.updateBy != null"> update_by = #{payBaseWaterprice.updateBy,jdbcType = BIGINT},</if>
-            <if test="payBaseWaterprice.updateDate != null"> update_date = #{payBaseWaterprice.updateDate,jdbcType=TIMESTAMP}</if>
-            <if test="payBaseWaterprice.companyOrgId != null"> company_org_id = #{payBaseWaterprice.companyOrgId}</if>
-            <if test="payBaseWaterprice.deptOrgId != null"> dept_org_id = #{payBaseWaterprice.deptOrgId}</if>
+            <if test="payBaseWaterprice.updateDate != null"> update_date = #{payBaseWaterprice.updateDate,jdbcType=TIMESTAMP},</if>
+            <if test="payBaseWaterprice.companyOrgId != null"> company_org_id = #{payBaseWaterprice.companyOrgId},</if>
+            <if test="payBaseWaterprice.deptOrgId != null"> dept_org_id = #{payBaseWaterprice.deptOrgId},</if>
 
         </set>
         where id=#{payBaseWaterprice.id,jdbcType=BIGINT}

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

@@ -147,6 +147,7 @@ public class BaseWaterPropertyServiceImpl implements BaseWaterPropertyService {
         baseWaterPropertyDto.setUpdateDate(LocalDateTime.now());
         baseWaterPropertyDto.setTenantId(loginUser.getTenantId());
         baseWaterPropertyDto.setCompanyOrgId(baseWaterPropertyFormDto.getCompanyOrgId());
+        baseWaterPropertyDto.setCompanyOrgId(baseWaterPropertyFormDto.getCompanyOrgId());
         //删除之前的关联关系
         basePriceOfWaterPropertyMapper.delete(id);