equipment修改bug修改

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipmentController.java

 package com.neotel.smfcore.core.equipment.rest;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -118,6 +119,7 @@ public class EquipmentController {
         } if(StringUtils.isEmpty(equipment.getType())){
             throw new ValidateException("smfcore.valueCanotNull","{0}不能为空",new String[]{"type"} );
         }
+        String oldCid="";
         for (Equipment equ : equipmentCache.getAllEquipment().values()) {
             if (!equipment.getId().equals(equ.getId())){
                 if(equipment.getName().equals(equ.getName())){
@@ -126,10 +128,15 @@ public class EquipmentController {
                 if(equipment.getCid().equals(equ.getCid())){
                     throw new ValidateException("smfcore.valueAlreadyExist","{0}[{1}]已存在",new String[]{"cid",equipment.getCid()});
                 }
+            }else{
+                oldCid=equ.getCid();
             }
         }
+        if(ObjectUtil.isEmpty(oldCid)){
+            oldCid=equipment.getCid();
+        }
         equipmentManager.save(equipment);
-        equipmentCache.reloadEquipment(equipment,equipment.getCid());
+        equipmentCache.reloadEquipment(equipment,oldCid);
         return new ResponseEntity<>(HttpStatus.OK);
     }