sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_xds

dev_xds
姜玉琦 2024-09-07 20:59:58 +08:00
parent 61e7eca112 10274861ca
commit 68373bee98
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.DeptTypeEnum;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysPermissionService;
@ -116,6 +117,9 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService {
surProject.setNowRole(nowRole);
surProject.setNowUser(Convert.toStr(userData.get("user_id")));
List<SurProject> projectList = surProjectMapper.selectSurProjectList(surProject);
if(projectList==null || projectList.size()==0){
throw new ServiceException("账号未关联到项目信息，无法继续登录。");
}
//只有一个项目时直接保存项目信息
if(projectList!=null && projectList.size()==1){
Map<String,Object> projectInfo = new HashMap<>();