Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java

@@ -83,7 +83,7 @@ public class DfDangerousProjectController {
     @ApiOperation("堤防病险工程核查项目内容新增/修改")
     @Log(title = "堤防病险工程核查项目内容新增/修改", businessType = BusinessType.INSERT)
     @PostMapping("/item")
-    public Response<DfDangerousProjectItemDto> addOrModifyItem(@RequestBody DfDangerousProjectItem item) {
+    public Response<DfDangerousProjectItemDto> addOrModifyItem(@RequestBody DfDangerousProjectItemDto item) {
         return Response.ok(dfDangerousProjectService.addOrModifyItem(item));
     }
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousProjectService.java

@@ -61,13 +61,14 @@ public class DfDangerousProjectService extends BaseService<DfDangerousProjectMap
 
 
     @Transactional(rollbackFor = Exception.class)
-    public DfDangerousProjectItemDto addOrModifyItem(DfDangerousProjectItem item) {
+    public DfDangerousProjectItemDto addOrModifyItem(DfDangerousProjectItemDto item) {
+        DfDangerousProjectItem projectItem = BeanCopyUtils.copy(item, DfDangerousProjectItem.class);
         if (item.getId() == null) {
-            projectItemMapper.insert(item);
+            projectItemMapper.insert(projectItem);
         } else {
-            projectItemMapper.updateById(item);
+            projectItemMapper.updateById(projectItem);
         }
-        return BeanCopyUtils.copy(item, DfDangerousProjectItemDto.class);
+        return BeanCopyUtils.copy(projectItem, DfDangerousProjectItemDto.class);
     }
 
     @Transactional(rollbackFor = Exception.class)

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousProjectService.java

@@ -68,7 +68,7 @@ public class SzDangerousProjectService extends BaseService<SzDangerousProjectMap
         } else {
             projectItemMapper.updateById(projectItem);
         }
-        return BeanCopyUtils.copy(item, SzDangerousProjectItemDto.class);
+        return BeanCopyUtils.copy(projectItem, SzDangerousProjectItemDto.class);
     }
 
     @Transactional(rollbackFor = Exception.class)