Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -185,8 +185,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (count > 0) {
             throw new LocalBadRequest("设备代码已存在，请重新输入！");
         }
-        // 编辑校验
-        this.checkForEquipEdit(equipmentInfoForm.get("RECORD"));
+        // 使用登记按照单位办理除外，其余进行编辑校验
+        Object manageType = equipmentInfoForm.get("manageType");
+        boolean isManageType = (!ObjectUtils.isEmpty(manageType) && "unit".equals(manageType));
+        if (!isManageType) {
+            // 编辑校验
+            this.checkForEquipEdit(equipmentInfoForm.get("RECORD"));
+        }
         //操作类型
         try {
             //保存数据