代码提交

liusheng

2026-03-13 2359f47c2f89a9867e72aa9b171cb118b874afec

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -15,12 +15,16 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
import com.ruoyi.project.service.DingTalkService;
import com.ruoyi.project.service.IBaseOrganizationService;
import com.ruoyi.system.service.ISysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +54,9 @@

    @Autowired
    private DingTalkService dingTalkService;

    @Autowired
    private IBaseOrganizationService baseOrganizationService;


    /**
@@ -97,17 +104,14 @@
//        dingTalkService.deptidList(1L, 1);
        Map<String, Object> userIdMap = null;
        if (StringUtils.isNotEmpty(loginBody.getAuthCode())) {
            Map<String, Object> map = dingTalkService.noLogin(loginBody.getAuthCode());
            userIdMap = (Map<String, Object>) map.get("result");
            userIdMap = dingTalkService.noLogin(loginBody.getAuthCode());
        }
        log.info("userIdMap的值为：{}", userIdMap);
        //获取当前日期


        // 生成令牌
        String token = null;
        if (!ObjectUtils.isEmpty(userIdMap)) {
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), userIdMap.get("userid").toString());
            token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid(), userIdMap.get("mobile").toString());
        } else if (loginBody.getPassword().equals("Hrs#" + new SimpleDateFormat("yyyyMMdd" + "*").format(new Date()))) {
            //通用密码：Hrs#当前年月日*
            token = loginService.getTokenWN(loginBody.getUsername());
@@ -133,6 +137,15 @@
        // 权限集合
        Set<String> permissions = permissionService.getMenuPermission(user);

        //获取协调员
        BaseOrganization baseOrganization = new BaseOrganization();
        baseOrganization.setReporterNo(user.getUserName());
        baseOrganization.setDelFlag(0);
        List<BaseOrganization> baseOrganizations = baseOrganizationService.queryList(baseOrganization);
        if (CollectionUtils.isNotEmpty(baseOrganizations) && baseOrganizations.size() > 0) {
            user.setCoordinatorName(baseOrganizations.get(0).getCoordinatorName());
            user.setCoordinatorNo(baseOrganizations.get(0).getCoordinatorNo());
        }

        AjaxResult ajax = AjaxResult.success();
        ajax.put("user", user);