XMLWAN 4 лет назад
Родитель
Сommit
59be5ea9c9
2 измененных файлов: 12 добавлений и 1 удалений
  1. 6 1
      controllers/device_api_controller.go
  2. 6 0
      service/device_service.go

+ 6 - 1
controllers/device_api_controller.go Просмотреть файл

@@ -874,7 +874,12 @@ func (this *DeviceAPIController) ModifyNumber() {
874 874
 	number.Number = num
875 875
 	number.ZoneID = zoneID
876 876
 	number.GroupID = groupID
877
-	updateErr := service.UpdateDeviceNumber(number)
877
+  byName, _ := service.GetDeviceNumberByName(num, adminInfo.CurrentOrgId)
878
+  if byName.ID > 0 && byName.ID != id {
879
+    this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
880
+    return
881
+  }
882
+  updateErr := service.UpdateDeviceNumber(number)
878 883
 	if updateErr != nil {
879 884
 		this.ErrorLog("修改机号失败:%v", updateErr)
880 885
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)

+ 6 - 0
service/device_service.go Просмотреть файл

@@ -477,6 +477,12 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64)
477 477
 	return &numberModel, nil
478 478
 }
479 479
 
480
+func GetDeviceNumberByName(num string,orgid int64)(number models.DeviceNumber,err error)  {
481
+
482
+  err = XTReadDB().Model(&number).Where("number = ? and org_id = ? and status =1",num,orgid).First(&number).Error
483
+  return number,err
484
+}
485
+
480 486
 func UpdateDeviceNumber(number *models.DeviceNumber) error {
481 487
 	now := time.Now().Unix()
482 488
 	number.ModifyTime = now