bug8230

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -54,6 +54,10 @@ public interface SysUserFeignService {
 										   @RequestParam("clientId")String clientId,
 										   @RequestParam("clientSecret")String clientSecret);
 
+	@GetMapping(value = "user/getTenantByClient")
+	@ApiOperation(value = "获取机构编号")
+	Long getTenantByClient(Long userId,String clientId);
+
 	@GetMapping(value = "exit")
 	@ApiOperation(value = "退出登录")
 	HttpResponseResult<String> logout();

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -68,6 +68,10 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return HttpResponseResult.failed("请求失败");
 	}
 
+	public Long getTenantByClient(Long userId,String clientId){
+		return -1l;
+	}
+
 	@Override
 	public HttpResponseResult<String> logout() {
 		return HttpResponseResult.failed("请求失败");

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -408,7 +408,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     @Override
     public Long getTenantByClient(Long userId, String clientId) {
         // 查询用户机构信息，若没有则返回-1
-        return Optional.ofNullable(sysUserDao.getTenantByClient(userId, clientId)).orElse(-1L);
+        return Optional.ofNullable(sysUserDao.getTenantByClient(userId, clientId.toUpperCase())).orElse(-1L);
     }
 
     /**

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -135,6 +135,11 @@ public class UserController extends BaseController {
         return sysUserService.get(userId);
     }
 
+    @GetMapping(value = "/getTenantByClient")
+    public Long getTenantByClient(Long userId,String clientId) {
+        return sysUserService.getTenantByClient(userId,clientId);
+    }
+
     @PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
     public HttpResponseResult<Boolean> updateSysUser(@RequestBody SysUser user) {
         user.setUpdateTime(new Date());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserService.java

@@ -16,6 +16,8 @@ public interface SysUserService{
 
     SysUser findUserById(Long userId);
 
+    Long getTenantByClient(Long userId,String clientId);
+
     /**
      * 实名 + 注册协议
      *

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -70,6 +70,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 
 	@Override
 	public long insert(SysMusicCompareRecord bean) {
+		Long tenant = sysUserService.getTenantByClient(bean.getUserId(), bean.getClientId());
+		bean.setTenantId(tenant);
 		// 保存评测记录
 		long record = super.insert(bean);
 
@@ -239,7 +241,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Override
 	@Transactional
 	public void saveMusicCompareData(SysMusicCompareRecord sysMusicCompareRecord) {
-
+		Long tenant = sysUserService.getTenantByClient(sysMusicCompareRecord.getUserId(), sysMusicCompareRecord.getClientId());
+		sysMusicCompareRecord.setTenantId(tenant);
 		int record = sysMusicCompareRecordDao.update(sysMusicCompareRecord);
 
 		if (record > 0) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -61,6 +61,11 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
+    public Long getTenantByClient(Long userId, String clientId) {
+        return sysUserFeignService.getTenantByClient(userId,clientId);
+    }
+
+    @Override
     public IdcardInfoExtractor updateUserCard(RealnameAuthReq realNameAuthDto, SysUser sysUser,ClientEnum client) {
         IdcardValidator idcardValidator = new IdcardValidator();
         //验证身份证号合法性