Explorar el Código

修改新增用户企业问题

zhangxin hace 2 semanas
padre
commit
005d59f20d

+ 2 - 0
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java

@@ -101,6 +101,8 @@ public class SysUserController {
 		user.setUserId(null);
 		//获取用户所属的角色列表
 		List<Long> roleIdList = sysRoleService.listRoleIdByUserId(userId);
+		//获取用户所属企业列表
+		user.setChannelIdList(sysUserService.findByUserIdListId(userId));
 		user.setRoleIdList(roleIdList);
 		return  R.SUCCESS(user);
 	}

+ 5 - 3
yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java

@@ -98,12 +98,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserChannelMapper.deleteByUserId(user.getUserId());
         if (CollUtil.isEmpty(user.getRoleIdList())&& CollUtil.isEmpty(user.getChannelIdList())) {
             return;
-        }else if (!CollUtil.isEmpty(user.getRoleIdList())){
+        }
+        if (!CollUtil.isEmpty(user.getRoleIdList())){
             //保存用户与角色关系
             sysUserRoleMapper.insertUserAndUserRole(user.getUserId(), user.getRoleIdList());
-        }else if (!CollUtil.isEmpty(user.getChannelIdList())){
+        }
+        if (!CollUtil.isEmpty(user.getChannelIdList())){
             //保存用户与企业关系
-            sysUserChannelMapper.insertUserAndUserChannel(user.getUserId(), user.getRoleIdList());
+            sysUserChannelMapper.insertUserAndUserChannel(user.getUserId(), user.getChannelIdList());
         }
 
         // 更新用户部门信息