|
@@ -27,6 +27,7 @@ import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
|
|
|
import com.zhongshu.card.server.core.domain.org.Organization;
|
|
import com.zhongshu.card.server.core.domain.org.Organization;
|
|
|
import com.zhongshu.card.server.core.domain.org.OrganizationUser;
|
|
import com.zhongshu.card.server.core.domain.org.OrganizationUser;
|
|
|
import com.zhongshu.card.server.core.domain.org.UserAccount;
|
|
import com.zhongshu.card.server.core.domain.org.UserAccount;
|
|
|
|
|
+import com.zhongshu.card.server.core.service.base.CommonService;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
|
|
import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
|
|
|
import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
|
|
import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
|
|
@@ -50,7 +51,9 @@ import org.springframework.util.Assert;
|
|
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -91,6 +94,8 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private OrganizationUserServiceImpl organizationUserService;
|
|
private OrganizationUserServiceImpl organizationUserService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private CommonService commonService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 注册基本用户 (没有就注册,有就修改)
|
|
* 注册基本用户 (没有就注册,有就修改)
|
|
@@ -164,6 +169,14 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
}
|
|
}
|
|
|
userAccount.setRealName(realName);
|
|
userAccount.setRealName(realName);
|
|
|
userCountDao.save(userAccount);
|
|
userCountDao.save(userAccount);
|
|
|
|
|
+
|
|
|
|
|
+ // 更新关联的
|
|
|
|
|
+ Map<String, Object> where = new HashMap<>();
|
|
|
|
|
+ where.put("userId", userAccount.getUserId());
|
|
|
|
|
+
|
|
|
|
|
+ Map<String, Object> standardData = new HashMap<>();
|
|
|
|
|
+ standardData.put("name", userAccount.getName());
|
|
|
|
|
+ commonService.updateData(where, standardData, OrganizationUser.class.getSimpleName());
|
|
|
}
|
|
}
|
|
|
return ResultContent.buildSuccess(userAccount.getUserId());
|
|
return ResultContent.buildSuccess(userAccount.getUserId());
|
|
|
}
|
|
}
|