-修改台账判重

master/src/main/java/com/ruoyi/project/base/controller/TBasePlantController.java

@@ -102,7 +102,7 @@ public class TBasePlantController extends BaseController
     {
         TBasePlant plant = tBasePlantService.selectTBasePlantByName(tBasePlant.getPlantName());
         if (plant != null){
-            return AjaxResult.success("当前装置已存在!");
+            return AjaxResult.error("当前装置已存在!");
         }
         tBasePlant.setUpdatedate(new Date());
         tBasePlant.setUpdaterCode(getUserId());

master/src/main/java/com/ruoyi/project/base/controller/TBaseRegionController.java

@@ -117,7 +117,7 @@ public class TBaseRegionController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TBaseRegion tBaseRegion) {
         QueryWrapper<TBaseRegion> wrapper = new QueryWrapper<>();
-        wrapper.eq("plant_id", tBaseRegion.getPlantId()).eq("region_name",tBaseRegion.getRegionName()).eq("region_id",tBaseRegion.getRegionId());
+        wrapper.eq("plant_id", tBaseRegion.getPlantId()).eq("region_name",tBaseRegion.getRegionName()).ne("region_id",tBaseRegion.getRegionId());
         if(CollectionUtils.isNotEmpty(tBaseRegionMapper.selectList(wrapper))){
             return AjaxResult.error("不可修改为已存在的数据");
         }

master/src/main/java/com/ruoyi/project/base/domain/TBaseRegion.java

@@ -98,6 +98,7 @@ public class TBaseRegion extends BaseEntity {
      * 修改人
      */
     @Excel(name = "修改人")
+    @TableField(exist = false)
     private String updater;
     private Long updaterCode;
 

ui/src/views/base/plant/index.vue

@@ -262,7 +262,7 @@ export default {
       // 表单校验
       rules: {
         company: [
-          {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
+          {required: true, message: this.$t('归属机构') + this.$t('不能为空'), trigger: "blur"}
         ],
         plantName: [
           {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}