Merge remote-tracking branch 'origin/master'

无关风月

2025-06-26 0856f6b514da35bb4af75c5b60a9f362ac129b0f

Merge remote-tracking branch 'origin/master'

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TIndexController.java

@@ -284,7 +284,7 @@
                BeanUtils.copyProperties(projectDept, projectDeptListNoLimitVO1);
                projectDeptListNoLimitVOS1.add(projectDeptListNoLimitVO1);
            }
            projectDeptListNoLimitVO.setChildren(projectDeptListNoLimitVOS1);
            projectDeptListNoLimitVO.setChildrenList(projectDeptListNoLimitVOS1);
            projectDeptListNoLimitVOS.add(projectDeptListNoLimitVO);
        }
        return R.ok(projectDeptListNoLimitVOS);

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -139,7 +139,6 @@
        // 用户验证
        Authentication authentication = null;
        // 用户验证
        username = username + "_applet";
        SysUser user = userService.selectUserByUserName(username);
        if (StringUtils.isNull(user)){
            log.info("登录用户：{} 不存在.", username);
@@ -153,7 +152,8 @@
        }
        try
        {
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
            String username1 = username + "_applet";
            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username1, password);
            AuthenticationContextHolder.setContext(authenticationToken);
            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
            authentication = authenticationManager.authenticate(authenticationToken);

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -38,10 +38,13 @@
    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
    {
        String name;
        if(username.contains("applet")){
            username = username.split("_")[0];
            name = username.split("_")[0];
        }else {
            name = username;
        }
        SysUser user = userService.selectUserByUserName(username);
        SysUser user = userService.selectUserByUserName(name);
        if (StringUtils.isNull(user))
        {
            log.info("登录用户：{} 不存在.", username);

 ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptListNoLimitVO.java

@@ -1,6 +1,5 @@
package com.ruoyi.system.vo.system;

import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.TProjectDept;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,5 +12,5 @@
public class ProjectDeptListNoLimitVO extends TProjectDept {

    @ApiModelProperty("下级片区")
    private List<ProjectDeptListNoLimitVO> children;
    private List<ProjectDeptListNoLimitVO> childrenList;
}