Merge branch 'dev' into de_wangfs_202511

戈灵虎
2 parents ab684b2e f3ee0b70
Showing 2 changed files with 9 additions and 1 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/OldtreesController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/vo/OldtreesSaveReqVO.java
@@ -50,6 +50,15 @@ public class OldtreesController {
     @Operation(summary = "创建古树名木")
     @PreAuthorize("@ss.hasPermission('garden:oldtrees:create')")
     public CommonResult<String> createOldtrees(@Valid @RequestBody OldtreesSaveReqVO createReqVO) {
+
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
+        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        createReqVO.setCreateby(String.valueOf(userId));
+        createReqVO.setCreatetime(LocalDateTime.now());
+        createReqVO.setUpdateby(String.valueOf(userId));
+        createReqVO.setUpdatetime(LocalDateTime.now());
+        createReqVO.setDeptId(loginUserDeptId);
+
         return success(oldtreesService.createOldtrees(createReqVO));
     }
@@ -135,7 +135,6 @@ public class OldtreesSaveReqVO {
     private LocalDateTime updatetime;
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20245")
-    @NotNull(message = "部门id不能为空")
     private Long deptId;
     private List<String> treeImgList;