Compare commits
2 Commits
1b8f7a8ef1
...
ebdeab8204
| Author | SHA1 | Date | |
|---|---|---|---|
| ebdeab8204 | |||
| 99dac967bc |
+1
@@ -30,6 +30,7 @@ public class PortalPropertyService extends AbstractDataService<PortalPropertyGro
|
|||||||
.orElse(new PortalPropertyGroup());
|
.orElse(new PortalPropertyGroup());
|
||||||
|
|
||||||
return portalPropertyGroup.getPortalProperties().stream()
|
return portalPropertyGroup.getPortalProperties().stream()
|
||||||
|
.filter(portalProperty -> portalProperty.getPropertyValue() != null)
|
||||||
.collect(Collectors.toMap(
|
.collect(Collectors.toMap(
|
||||||
portalProperty -> portalProperty.getId().getPropertyName(),
|
portalProperty -> portalProperty.getId().getPropertyName(),
|
||||||
PortalProperty::getPropertyValue,
|
PortalProperty::getPropertyValue,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.eactive.apim.portal.portaluser.entity;
|
package com.eactive.apim.portal.portaluser.entity;
|
||||||
|
|
||||||
|
import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
|
||||||
import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
|
import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.hibernate.annotations.Comment;
|
import org.hibernate.annotations.Comment;
|
||||||
@@ -40,6 +41,7 @@ public class UserRoleHistory implements Serializable, com.eactive.eai.data.Data
|
|||||||
@Column(name = "id", columnDefinition = "number(19)")
|
@Column(name = "id", columnDefinition = "number(19)")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
@Convert(converter = PersonalDataEncryptConverter.class)
|
||||||
@Column(name = "user_id", length = 255, nullable = false)
|
@Column(name = "user_id", length = 255, nullable = false)
|
||||||
@Comment("대상 사용자 ID(loginId)")
|
@Comment("대상 사용자 ID(loginId)")
|
||||||
private String userId;
|
private String userId;
|
||||||
@@ -56,6 +58,7 @@ public class UserRoleHistory implements Serializable, com.eactive.eai.data.Data
|
|||||||
@Comment("변경 유형(MANAGER_ASSIGN/MANAGER_REVOKE/ORG_REMOVE 등)")
|
@Comment("변경 유형(MANAGER_ASSIGN/MANAGER_REVOKE/ORG_REMOVE 등)")
|
||||||
private String changeType;
|
private String changeType;
|
||||||
|
|
||||||
|
@Convert(converter = PersonalDataEncryptConverter.class)
|
||||||
@Column(name = "changed_by", length = 255, nullable = false)
|
@Column(name = "changed_by", length = 255, nullable = false)
|
||||||
@Comment("변경 수행자(loginId)")
|
@Comment("변경 수행자(loginId)")
|
||||||
private String changedBy;
|
private String changedBy;
|
||||||
@@ -65,6 +68,7 @@ public class UserRoleHistory implements Serializable, com.eactive.eai.data.Data
|
|||||||
@Convert(converter = LocalDateTimeToStringConverter14.class)
|
@Convert(converter = LocalDateTimeToStringConverter14.class)
|
||||||
private LocalDateTime changeDate;
|
private LocalDateTime changeDate;
|
||||||
|
|
||||||
|
@Convert(converter = PersonalDataEncryptConverter.class)
|
||||||
@Column(name = "created_by", length = 255, nullable = false)
|
@Column(name = "created_by", length = 255, nullable = false)
|
||||||
@Comment("생성자")
|
@Comment("생성자")
|
||||||
private String createdBy;
|
private String createdBy;
|
||||||
|
|||||||
Reference in New Issue
Block a user