Merge branch 'dev'

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

@@ -42,6 +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::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

@@ -88,6 +88,7 @@ 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())
                 .eq(EnforceObjArchitectureRelate::getArchitectureUuid, param.getArchitectureUuid()).eq(EnforceObjArchitectureRelate::getRelateType,param.getRelateType()));
         if (null != dt) {
             log.info("建筑已存在！");