edit number

src/main/java/com/zglc/fm/service/FaultService.java

@@ -128,16 +128,19 @@ public class FaultService {
     public Result<String> edit(FaultEntity data) {
         boolean flag = true;
         String msg = "";
-        Example example = new Example(FaultEntity.class);
-        example.createCriteria().andEqualTo("fault_number",data.getFault_number());
-        List<FaultEntity> lst = faultDao.selectByExample(example);
-        if (lst.size() > 0) {
-            flag = false;
-            msg = "修改故障信息失败,案例编号已存在!";
-        }
-        else {
-            FaultEntity tmpData = faultDao.selectByPrimaryKey(data.getId());
-            if (tmpData != null) {
+        FaultEntity faultEntity = faultDao.selectByPrimaryKey(data.getId());
+        if (faultEntity != null)
+        {
+            if (faultEntity.getFault_number().compareTo(data.getFault_number()) != 0)
+            {
+                Example example = new Example(FaultEntity.class);
+                example.createCriteria().andEqualTo("fault_number", data.getFault_number());
+                List<FaultEntity> lst = faultDao.selectByExample(example);
+                if (lst.size() > 0) {
+                    flag = false;
+                    msg = "修改故障信息失败,案例编号已存在!";
+                }
+            } else {
                 int index = faultDao.updateByPrimaryKeySelective(data);
                 if (index == 0) {
                     flag = false;
@@ -145,11 +148,13 @@ public class FaultService {
                 } else {
                     msg = "故障信息修改成功";
                 }
-            } else {
-                flag = false;
-                msg = "故障信息不存在!";
             }
         }
+        else
+        {
+            flag = false;
+            msg = "故障信息不存在!";
+        }
 
         return Result.result(flag, msg, msg);
     }