|
|
@@ -63,31 +63,28 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
public User insertRegister(User user, String contacts, String unitName, String username) {
|
|
|
userMapper.insert(user);
|
|
|
if (null != user.getType() && UserType.ORGANIZATION.getCode().equals(user.getType())) {
|
|
|
- if (!StringUtils.isBlank(unitName) || !StringUtils.isBlank(contacts)) {
|
|
|
- OrganizationIdentity organizationIdentity = new OrganizationIdentity();
|
|
|
- organizationIdentity.setUid(user.getId());
|
|
|
- organizationIdentity.setUnitName(StringUtils.isBlank(unitName) ? "" : unitName);
|
|
|
- organizationIdentity.setContacts(StringUtils.isBlank(contacts) ? "" : contacts);
|
|
|
- organizationIdentity.setId(UUID.randomUUID().toString());
|
|
|
- organizationIdentity.setIdentityType(0);
|
|
|
- organizationIdentity.setAuditStatus(0);
|
|
|
- organizationIdentity.setProcess(0);
|
|
|
- organizationIdentity.setWrongCount(0);
|
|
|
- organizationIdentity.setListed(0);
|
|
|
- organizationIdentity.setListedType(0);
|
|
|
- organizationIdentityMapper.insert(organizationIdentity);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (null != user.getType() && UserType.PERSONAL.getCode().equals(user.getType())
|
|
|
- && StringUtils.isNotBlank(username)) {
|
|
|
+ OrganizationIdentity organizationIdentity = new OrganizationIdentity();
|
|
|
+ organizationIdentity.setUid(user.getId());
|
|
|
+ organizationIdentity.setUnitName(StringUtils.isBlank(unitName) ? "" : unitName);
|
|
|
+ organizationIdentity.setContacts(StringUtils.isBlank(contacts) ? "" : contacts);
|
|
|
+ organizationIdentity.setId(UUID.randomUUID().toString());
|
|
|
+ organizationIdentity.setIdentityType(0);
|
|
|
+ organizationIdentity.setAuditStatus(0);
|
|
|
+ organizationIdentity.setProcess(0);
|
|
|
+ organizationIdentity.setWrongCount(0);
|
|
|
+ organizationIdentity.setListed(0);
|
|
|
+ organizationIdentity.setListedType(0);
|
|
|
+ organizationIdentityMapper.insert(organizationIdentity);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null != user.getType() && UserType.PERSONAL.getCode().equals(user.getType())) {
|
|
|
UserIdentity ui = new UserIdentity();
|
|
|
ui.setId(UUID.randomUUID().toString());
|
|
|
ui.setUid(user.getId());
|
|
|
ui.setAuditStatus(0);
|
|
|
ui.setProcess(0);
|
|
|
ui.setWrongCount(0);
|
|
|
- ui.setUsername(username);
|
|
|
+ ui.setUsername(StringUtils.isBlank(username) ? "" : username);
|
|
|
userIdentityMapper.insert(ui);
|
|
|
}
|
|
|
|
|
|
@@ -503,7 +500,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- return (Pagination<StarAndExpertListBo>) findPage("findStarAndExpertListByPage", "findStarAndExpertCount", params, pNo, pSize);
|
|
|
+ return (Pagination<StarAndExpertListBo>) findPage("findStarAndExpertListByPage", "findStarAndExpertCount",
|
|
|
+ params, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
}
|