lyhzzz 9 ماه پیش
والد
کامیت
39f01efaae

+ 10 - 7
src/main/java/com/fdkankan/manage/service/impl/ManageService.java

@@ -7,14 +7,9 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.RedisKeyUtil;
 import com.fdkankan.manage.common.RedisKeyUtil;
-import com.fdkankan.manage.entity.JyUser;
-import com.fdkankan.manage.entity.SysUser;
-import com.fdkankan.manage.entity.User;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.service.IJyUserPlatformService;
-import com.fdkankan.manage.service.IJyUserService;
-import com.fdkankan.manage.service.ISysUserService;
-import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -35,6 +30,8 @@ public class ManageService {
     @Autowired
     @Autowired
     IJyUserPlatformService jyUserPlatformService;
     IJyUserPlatformService jyUserPlatformService;
     @Autowired
     @Autowired
+    IJyPlatformService platformService;
+    @Autowired
     RedisUtil redisUtil;
     RedisUtil redisUtil;
 
 
 
 
@@ -70,6 +67,12 @@ public class ManageService {
         User user = byUserName.get(0);
         User user = byUserName.get(0);
 
 
         JyUser jyUser = jyUserService.getBySysId(result.getId());
         JyUser jyUser = jyUserService.getBySysId(result.getId());
+        if(jyUser.getPlatformId() != null){
+            JyPlatform jyPlatform = platformService.getById(jyUser.getPlatformId());
+            if(jyPlatform != null){
+                result.setPlatformName(jyPlatform.getPlatformName());
+            }
+        }
 
 
         StpUtil.login(result.getId(), SaLoginConfig
         StpUtil.login(result.getId(), SaLoginConfig
                 .setExtra("id",result.getId())
                 .setExtra("id",result.getId())

+ 1 - 0
src/main/java/com/fdkankan/manage/vo/response/ManageLoginResponse.java

@@ -16,5 +16,6 @@ public class ManageLoginResponse {
      */
      */
     private Integer status;
     private Integer status;
     private Long userId;
     private Long userId;
+    private String platformName;
 
 
 }
 }