Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -18,6 +18,7 @@ import cn.com.ty.lift.system.utils.CommonUtil;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -308,6 +309,17 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //更新公司用户信息
         Long companyId = userApplication.getMtCompanyId();
         Long userId = userApplication.getUserId();
+        //查看用户在之前公司有没有角色信息
+        UserRole oldUserRole = userRoleService.getOne(Wrappers.<UserRole>query().
+                eq("user_id", userId).
+                eq("company_id", companyId)
+        );
+        //删掉原有角色
+        if (oldUserRole != null) {
+            if (!userRoleService.removeById(oldUserRole.getId())) {
+                return RestResponse.fail(ApiConstants.RESULT_ERROR, "删除用户原来关联的角色信息失败");
+            }
+        }
         //给用户分配角色
         UserRole userRole = new UserRole();
         userRole.setCompanyId(companyId);