总检看职业病

lige

2023-12-07 eabf890be5718f5e22d03e3ce2b530da0568a8d0

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

@@ -111,10 +111,8 @@
    @GetMapping("getInfo")
    public AjaxResult getInfo() {
        AjaxResult ajax = success();
//        SysUser user = Objects.requireNonNull(SecurityUtils.getLoginUser()).getUser();
        SysUser user = UserHoder.getLoginUser().getUser();
        if (null != user.getUserId()) {
            String message=null;
            if (secretKeyLogin)
            {
                if(null !=user.getDeptId()){
@@ -123,7 +121,7 @@
                        if (null != sysDept) {
                            DictHosp dictHosp = hospService.getById(sysDept.getHospId());
                            if(null !=dictHosp && dictHosp.getSecretKey() !=null && dictHosp.getExpirationTime() !=null){
                                if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getAreaid(),
                                if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
                                        dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {

                                    String userIdKey = Constants.LOGIN_USERID_KEY + user.getUserId();
@@ -133,12 +131,10 @@
                                        redisCache.deleteObject(userIdKey);
                                        redisCache.deleteObject(userKey);
                                    }

                                    throw new SecretKeyException("商家已过期请续费使用");
                                }
                                long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
                                if(between<=30){
//                                    message="还有 "+between+" 天到期 请注意续费! 以免影响正常使用!";
                                    UserHoder.getLoginUser().setMessage("还有 "+between+" 天到期 请注意续费! 以免影响正常使用!");
                                }
                            }else {
@@ -155,6 +151,7 @@
            ajax.put("roles", roles);
            ajax.put("permissions", permissions);
            ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
            ajax.put("hospName",UserHoder.getLoginUser().getHospName());
        } else {
            Set<String> roles = new HashSet<>();
            LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -175,6 +172,7 @@
            ajax.put("permissions", permissions);
            ajax.put("post",null);
            ajax.put("securitMessage",null);
            ajax.put("hospName",UserHoder.getLoginUser().getHospName());
        }
        return ajax;
    }