|
|
@@ -3057,13 +3057,25 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
public Object checkUser(String id) {
|
|
|
User user = userMapper.queryById(id);
|
|
|
OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(id);
|
|
|
- if (user==null||user.getNickname()==null||oi.getOrgCode()==null||oi.getContacts()==null||
|
|
|
- oi.getContactMobile()==null||user.getSocietyTag()==null||oi.getLocationProvince()==null||
|
|
|
- oi.getLocationCity()==null||oi.getLocationArea()==null||user.getType()==null||oi.getIntendedProject()==null||
|
|
|
- oi.getBusinessScope()==null||user.getLevel()==null){
|
|
|
- return false;
|
|
|
- }
|
|
|
- return true;
|
|
|
+ return getInputUpdateAndReceiveCustomer(user, oi);
|
|
|
+ }
|
|
|
+
|
|
|
+ private InputUpdateAndReceiveCustomer getInputUpdateAndReceiveCustomer(User user, OrganizationIdentity oi) {
|
|
|
+ InputUpdateAndReceiveCustomer out = new InputUpdateAndReceiveCustomer();
|
|
|
+ out.setId(user.getId());
|
|
|
+ out.setName(user.getNickname());
|
|
|
+ out.setOrgCode(oi.getOrgCode());
|
|
|
+ out.setContacts(oi.getContacts());
|
|
|
+ out.setContactMobile(oi.getContactMobile());
|
|
|
+ out.setSocietyTag(user.getSocietyTag());
|
|
|
+ out.setType(user.getType());
|
|
|
+ out.setIntendedProject(oi.getIntendedProject());
|
|
|
+ out.setBusinessScope(oi.getBusinessScope());
|
|
|
+ out.setProvince(oi.getLocationProvince());
|
|
|
+ out.setCity(oi.getLocationCity());
|
|
|
+ out.setArea(oi.getLocationArea());
|
|
|
+ out.setLevel(user.getLevel());
|
|
|
+ return out;
|
|
|
}
|
|
|
|
|
|
@Override
|