Commit348c98e

authored

Merge branch 'lowcoder-org:dev' into dev

2 parents800c16c +eb0e0d5 commit348c98eCopy full SHA for 348c98e

File tree

+19

-0

lines changed

+19

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,9 @@ public class Folder extends HasIdAndAuditing {`
`17`	`17`	`@Nullable`
`18`	`18`	`privateStringparentFolderId;// null represents folder in the root folder`
`19`	`19`	`privateStringname;`
	`20`	`+privateStringtitle;`
	`21`	`+privateStringdescription;`
	`22`	`+privateStringcategory;`
	`23`	`+privateStringtype;`
	`24`	`+privateStringimage;`
`20`	`25`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,11 @@ private Mono<Void> removePermissions(String folderId) {`
`182`	`182`	`publicMono<FolderInfoView>update(Folderfolder) {`
`183`	`183`	`FoldernewFolder =newFolder();`
`184`	`184`	`newFolder.setName(folder.getName());`
	`185`	`+newFolder.setTitle(folder.getTitle());`
	`186`	`+newFolder.setType(folder.getType());`
	`187`	`+newFolder.setCategory(folder.getCategory());`
	`188`	`+newFolder.setDescription(folder.getDescription());`
	`189`	`+newFolder.setImage(folder.getImage());`
`185`	`190`	`returncheckManagePermission(folder.getId())`
`186`	`191`	`.then(folderService.updateById(folder.getId(),newFolder))`
`187`	`192`	`.then(folderService.findById(folder.getId()))`
`@@ -421,6 +426,10 @@ public Mono<FolderInfoView> buildFolderInfoView(Folder folder, boolean visible,`
`421`	`426`	`.folderId(folder.getId())`
`422`	`427`	`.parentFolderId(folder.getParentFolderId())`
`423`	`428`	`.name(folder.getName())`
	`429`	`+ .description(folder.getDescription())`
	`430`	`+ .category(folder.getCategory())`
	`431`	`+ .type(folder.getType())`
	`432`	`+ .image(folder.getImage())`
`424`	`433`	`.createAt(folder.getCreatedAt() ==null ?0 :folder.getCreatedAt().toEpochMilli())`
`425`	`434`	`.createBy(user.getName())`
`426`	`435`	`.createTime(folder.getCreatedAt())`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ public class FolderInfoView {`
`20`	`20`	`privatefinalStringfolderId;`
`21`	`21`	`privatefinalStringparentFolderId;`
`22`	`22`	`privatefinalStringname;`
	`23`	`+privatefinalStringtitle;`
	`24`	`+privatefinalStringdescription;`
	`25`	`+privatefinalStringcategory;`
	`26`	`+privatefinalStringtype;`
	`27`	`+privatefinalStringimage;`
`23`	`28`	`privatefinalLongcreateAt;`
`24`	`29`	`privatefinalStringcreateBy;`
`25`	`30`	`privatebooleanisVisible;`

Comments

(0)