Commit 9c1febad authored by neo's avatar neo

[dev] fixed some spell error

parent 8c1b4822
...@@ -99,7 +99,7 @@ public class LdapAuthenticationProviderImpl implements LdapAuthenticationProvide ...@@ -99,7 +99,7 @@ public class LdapAuthenticationProviderImpl implements LdapAuthenticationProvide
// set the initializing information of the context // set the initializing information of the context
env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, initialContextFactory); env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
// set the URL of ldap server // set the URL of ldap server
env.put(javax.naming.Context.PROVIdER_URL, ad4ProviderURL); env.put(javax.naming.Context.PROVIDER_URL, ad4ProviderURL);
// set the authentication mode // set the authentication mode
env.put(javax.naming.Context.SECURITY_AUTHENTICATION, securityAuthentication); env.put(javax.naming.Context.SECURITY_AUTHENTICATION, securityAuthentication);
// set user of AD // set user of AD
......
...@@ -293,7 +293,7 @@ public class FinanceDataImportServiceImpl { ...@@ -293,7 +293,7 @@ public class FinanceDataImportServiceImpl {
dto.getCustomerCode().isEmpty()).collect(Collectors.toList()); dto.getCustomerCode().isEmpty()).collect(Collectors.toList());
parentVouchers.forEach(m -> { parentVouchers.forEach(m -> {
List<VoucherBalanceDto> children = parentVouchers.stream().filter(dto -> m.getvId().equals(dto.getvId()) List<VoucherBalanceDto> children = parentVouchers.stream().filter(dto -> m.getVid().equals(dto.getVid())
&& m.getPeriod().intValue() == dto.getPeriod().intValue() && m.getPeriod().intValue() == dto.getPeriod().intValue()
&& m.getGroup().equals(dto.getGroup()) && dto.getCustomerCode() != null && m.getGroup().equals(dto.getGroup()) && dto.getCustomerCode() != null
&& !dto.getCustomerCode().isEmpty()).collect(Collectors.toList()); && !dto.getCustomerCode().isEmpty()).collect(Collectors.toList());
......
...@@ -221,7 +221,7 @@ public interface ProjectMapper extends MyMapper { ...@@ -221,7 +221,7 @@ public interface ProjectMapper extends MyMapper {
" <if test=\"serviceID != null and serviceID !='' \">AND ostg.ServiceTypeID=#{serviceId}</if>" + " <if test=\"serviceID != null and serviceID !='' \">AND ostg.ServiceTypeID=#{serviceId}</if>" +
"ORDER BY ea.EffectiveDate,org.Code" + "ORDER BY ea.EffectiveDate,org.Code" +
"</script>") "</script>")
List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(@Param("orgId") String orgId, @Param("serviceId") St ing serviceId); List<ProjectDisplayDto> getProjectFromEnterpriseAccountSetOrg(@Param("orgId") String orgId, @Param("serviceId") String serviceId);
@Select("SELECT " + @Select("SELECT " +
" PeriodId,Status " + " PeriodId,Status " +
......
...@@ -17,7 +17,7 @@ public class UserDto { ...@@ -17,7 +17,7 @@ public class UserDto {
private Date passwordUpdateTime; private Date passwordUpdateTime;
private Integer attemptTimes; private Integer attemptTimes;
private Date lockedTime; private Date lockedTime;
private String organizationID; private String organizationId;
private String organizationName; private String organizationName;
private Boolean isSuperAdmin; private Boolean isSuperAdmin;
...@@ -125,12 +125,12 @@ public class UserDto { ...@@ -125,12 +125,12 @@ public class UserDto {
this.lockedTime = lockedTime; this.lockedTime = lockedTime;
} }
public String getOrganizationID() { public String getOrganizationId() {
return organizationID; return organizationId;
} }
public void setOrganizationID(String organizationID) { public void setOrganizationId(String organizationId) {
this.organizationID = organizationID; this.organizationId = organizationId;
} }
public String getOrganizationName() { public String getOrganizationName() {
...@@ -162,7 +162,7 @@ public class UserDto { ...@@ -162,7 +162,7 @@ public class UserDto {
result = prime * result + ((isSuperAdmin == null) ? 0 : isSuperAdmin.hashCode()); result = prime * result + ((isSuperAdmin == null) ? 0 : isSuperAdmin.hashCode());
result = prime * result + ((lockedTime == null) ? 0 : lockedTime.hashCode()); result = prime * result + ((lockedTime == null) ? 0 : lockedTime.hashCode());
result = prime * result + ((loginType == null) ? 0 : loginType.hashCode()); result = prime * result + ((loginType == null) ? 0 : loginType.hashCode());
result = prime * result + ((organizationID == null) ? 0 : organizationID.hashCode()); result = prime * result + ((organizationId == null) ? 0 : organizationId.hashCode());
result = prime * result + ((organizationName == null) ? 0 : organizationName.hashCode()); result = prime * result + ((organizationName == null) ? 0 : organizationName.hashCode());
result = prime * result + ((password == null) ? 0 : password.hashCode()); result = prime * result + ((password == null) ? 0 : password.hashCode());
result = prime * result + ((passwordUpdateTime == null) ? 0 : passwordUpdateTime.hashCode()); result = prime * result + ((passwordUpdateTime == null) ? 0 : passwordUpdateTime.hashCode());
...@@ -226,10 +226,10 @@ public class UserDto { ...@@ -226,10 +226,10 @@ public class UserDto {
return false; return false;
} else if (!loginType.equals(other.loginType)) } else if (!loginType.equals(other.loginType))
return false; return false;
if (organizationID == null) { if (organizationId == null) {
if (other.organizationID != null) if (other.organizationId != null)
return false; return false;
} else if (!organizationID.equals(other.organizationID)) } else if (!organizationId.equals(other.organizationId))
return false; return false;
if (organizationName == null) { if (organizationName == null) {
if (other.organizationName != null) if (other.organizationName != null)
......
...@@ -25,7 +25,7 @@ public class Template { ...@@ -25,7 +25,7 @@ public class Template {
private Date createTime; private Date createTime;
private Date updateTime; private Date updateTime;
private Boolean isSystemType; private Boolean isSystemType;
private Integer isActiveAssociation; private Boolean isActiveAssociation;
private String parentId; private String parentId;
private String createBy; private String createBy;
private String updateBy; private String updateBy;
...@@ -140,11 +140,11 @@ public class Template { ...@@ -140,11 +140,11 @@ public class Template {
@Basic @Basic
@Column(name = "IS_ACTIVE_ASSOCIATION", nullable = false) @Column(name = "IS_ACTIVE_ASSOCIATION", nullable = false)
@ColumnDefault(DEF_DEFAULT_NUMBER) @ColumnDefault(DEF_DEFAULT_NUMBER)
public Integer getIsActiveAssociation() { public Boolean getIsActiveAssociation() {
return isActiveAssociation; return isActiveAssociation;
} }
public void setIsActiveAssociation(Integer isActiveAssociation) { public void setIsActiveAssociation(Boolean isActiveAssociation) {
this.isActiveAssociation = isActiveAssociation; this.isActiveAssociation = isActiveAssociation;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment