|
@@ -38,7 +38,6 @@ public class ApiController {
|
|
|
@ResponseBody
|
|
|
public BaseResult addUser (@RequestParam("id") String id,
|
|
|
@RequestParam("name") String name,
|
|
|
- @RequestParam("companyId") String companyId,
|
|
|
@RequestParam(value = "groupId", required = false) String groupId) {
|
|
|
BaseResult baseResult = new BaseResult();
|
|
|
|
|
@@ -60,15 +59,12 @@ public class ApiController {
|
|
|
user.setRevision(0);
|
|
|
user.setId(id);
|
|
|
user.setDisplayName(name);
|
|
|
- //企业id
|
|
|
- user.setTenantId(companyId);
|
|
|
user.setPassword("123");
|
|
|
// 新增用户
|
|
|
identityService.saveUser(user);
|
|
|
} else if (!dataUser.getDisplayName().equals(name)) {
|
|
|
user.setId(id);
|
|
|
user.setDisplayName(name);
|
|
|
- user.setTenantId(companyId);
|
|
|
user.setPassword("123");
|
|
|
// 新增用户
|
|
|
identityService.saveUser(user);
|
|
@@ -96,7 +92,7 @@ public class ApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "addGroup")
|
|
|
@ResponseBody
|
|
|
- public BaseResult addGroup (@RequestParam("groupId") String groupId,@RequestParam("companyId") String companyId, @RequestParam("groupName") String groupName){
|
|
|
+ public BaseResult addGroup (@RequestParam("groupId") String groupId, @RequestParam("groupName") String groupName){
|
|
|
GroupEntityImpl groupEntity = new GroupEntityImpl();
|
|
|
BaseResult baseResult = new BaseResult();
|
|
|
// 分组是否存在
|
|
@@ -105,8 +101,6 @@ public class ApiController {
|
|
|
|
|
|
groupEntity.setId(groupId);
|
|
|
groupEntity.setName(groupName);
|
|
|
- //企业id
|
|
|
- groupEntity.setType(companyId);
|
|
|
if (group == null) {
|
|
|
groupEntity.setRevision(0);
|
|
|
identityService.saveGroup(groupEntity);
|