Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init
This commit is contained in:
@@ -127,6 +127,9 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
|
|||||||
private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
|
private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
|
||||||
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
|
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
|
||||||
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
|
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
|
||||||
|
if(defaultUser == null){
|
||||||
|
defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
|
||||||
|
}
|
||||||
return defaultUser;
|
return defaultUser;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user