wuxw 1 rok temu
rodzic
commit
d0f55f8198

+ 4 - 3
java110-db/src/main/resources/mapper/community/MaintainanceItemValueV1ServiceDaoImplMapper.xml

@@ -59,9 +59,7 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="itemId !=null and itemId != ''">
-            , t.item_id= #{itemId}
-        </if>
+
         <if test="itemValue !=null and itemValue != ''">
             , t.item_value= #{itemValue}
         </if>
@@ -75,6 +73,9 @@
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
 
     </update>
 

+ 2 - 1
service-community/src/main/java/com/java110/community/cmd/maintainance/UpdateMaintainanceItemCmd.java

@@ -33,6 +33,7 @@ import com.java110.po.maintainance.MaintainanceItemValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
@@ -97,7 +98,7 @@ public class UpdateMaintainanceItemCmd extends Cmd {
         MaintainanceItemValueDto maintainanceItemValueDto = new MaintainanceItemValueDto();
         maintainanceItemValueDto.setItemId(reqJson.getString("itemId"));
         List<MaintainanceItemValueDto> maintainanceItemValueDtos = maintainanceItemValueV1InnerServiceSMOImpl.queryMaintainanceItemValues(maintainanceItemValueDto);
-        if (maintainanceItemValueDtos != null && maintainanceItemValueDtos.size() > 0) {
+        if (!ListUtil.isNull(maintainanceItemValueDtos)) {
             MaintainanceItemValuePo deleteMaintainanceItemValuePo = new MaintainanceItemValuePo();
             deleteMaintainanceItemValuePo.setItemId(maintainanceItemPo.getItemId());
             flag = maintainanceItemValueV1InnerServiceSMOImpl.deleteMaintainanceItemValue(deleteMaintainanceItemValuePo);