Merge remote-tracking branch 'gitee/master'

mitao

2025-02-12 ffb7bf307d13056bcf244b949cfe2f0ff15e0001

 medicalWaste-framework/src/main/java/com/sinata/framework/web/service/SysLoginService.java

@@ -20,8 +20,10 @@
import com.sinata.framework.manager.AsyncManager;
import com.sinata.framework.manager.factory.AsyncFactory;
import com.sinata.framework.security.context.AuthenticationContextHolder;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.service.ISysConfigService;
import com.sinata.system.service.ISysUserService;
import com.sinata.system.service.SysDepartmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@@ -51,6 +53,8 @@

    @Autowired
    private ISysConfigService configService;
    @Resource
    private SysDepartmentService departmentService;

    /**
     * 登录验证
@@ -141,6 +145,7 @@
        LoginUser loginUser = new LoginUser();
        loginUser.setUserId(one.getUserId());
        loginUser.setUser(one);

        // 生成token
        return loginUser;
    }