Merge branch 'dev'

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/EnforceObjArchitectureRelateController.java

@@ -42,7 +42,7 @@ public class EnforceObjArchitectureRelateController extends BaseController {
     @PostMapping("/enforceObjArchitectureRelate")
     public R<Boolean> save(@RequestBody EnforceObjArchitectureRelateAdd add) {
         EnforceObjArchitectureRelate enforceObjArchitectureRelate = enforceObjArchitectureRelateService.getOne(new LambdaQueryWrapper<EnforceObjArchitectureRelate>()
-                .eq(EnforceObjArchitectureRelate::getEnforceObjId, add.getEnforceObjId()).eq(EnforceObjArchitectureRelate::getRelateType,add.getRelateType()));
+                .eq(EnforceObjArchitectureRelate::getArchitectureUuid, add.getArchitectureUuid()).eq(EnforceObjArchitectureRelate::getRelateType,add.getRelateType()));
         if (null != enforceObjArchitectureRelate) {
             return R.ok(true);
         }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.enums.DeleteStatusEnum;
 import com.zfjg.common.security.utils.SecurityUtils;
 import com.zfjg.manage.api.domain.enforce.job.EnforceJobNodeItem;
@@ -87,9 +88,9 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
     public boolean updateEnforceObjArchitectureRelate(EnforceObjArchitectureRelateUpdate param) {
         SysUser user = SecurityUtils.getLoginUser().getSysUser();
         EnforceObjArchitectureRelate dt = this.getOne(new LambdaQueryWrapper<EnforceObjArchitectureRelate>()
-                .eq(EnforceObjArchitectureRelate::getEnforceObjId, param.getEnforceObjId()));
-        if (Objects.equals(param.getArchitectureUuid(), dt.getArchitectureUuid()) && Objects.equals(param.getRelateType(), dt.getRelateType())) {
-            log.info("选择建筑与之前一样！");
+                .eq(EnforceObjArchitectureRelate::getArchitectureUuid, param.getArchitectureUuid()).eq(EnforceObjArchitectureRelate::getRelateType,param.getRelateType()));
+        if (null != dt) {
+            log.info("建筑已存在！");
             return true;
         }
         EnforceObjArchitectureRelateHis his = new EnforceObjArchitectureRelateHis();