productDev/dmMes.git

			@@ -1,7 +1,6 @@
			package doumeemes.service.system.impl;

			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.iflytek.antelope.other.client.dto.resp.UserDTO;
			import doumeemes.biz.system.SystemDictDataBiz;
			import doumeemes.config.shiro.ShiroToken;
			@@ -13,9 +12,7 @@
			import doumeemes.core.utils.dingding.DingDingUtil;
			import doumeemes.core.utils.dingding.LingyangUtil;
			import doumeemes.core.utils.edpg.EdgpServerUtil;
			import doumeemes.core.utils.edpg.EdgpUtil;
			import doumeemes.core.utils.edpg.bean.AppUserInfoModel;
			import doumeemes.dao.business.dto.CompanyInitDataDTO;
			import doumeemes.dao.business.model.Company;
			import doumeemes.dao.business.model.CompanyUser;
			import doumeemes.dao.ext.CompanyExtMapper;
			@@ -93,9 +90,10 @@
			throw e;
			}
			}

			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
			ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
			try {
			subject.login(token);
			LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
			@@ -149,7 +147,7 @@
			}
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false);
			ShiroToken token = new ShiroToken(dto.getCompanyId(),dto.getUsername(), dto.getPassword(),false,false);
			try {
			subject.login(token);
			LoginUserInfo loginUser = ((LoginUserInfo)subject.getPrincipal());
			@@ -229,7 +227,7 @@
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			// 钉钉登录
			ShiroToken token = new ShiroToken(companyId,mobile, null,true);
			ShiroToken token = new ShiroToken(companyId,mobile, null,true,false);

			subject.login(token);
			LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
			@@ -295,7 +293,7 @@
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			// 钉钉登录
			ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
			ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
			subject.login(atoken);
			LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
			loginUser.getCompanyUser().setName(user.getName());
			@@ -366,7 +364,7 @@
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			// 钉钉登录
			ShiroToken atoken = new ShiroToken(companyId,mobile, null,true);
			ShiroToken atoken = new ShiroToken(companyId,mobile, null,true,false);
			subject.login(atoken);
			LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
			loginLog.setUserId(loginUser.getId());
			@@ -451,7 +449,7 @@
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			// 钉钉登录
			ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
			ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
			subject.login(atoken);
			LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
			loginUser.getCompanyUser().setName(user.getName());
			@@ -522,7 +520,7 @@
			// 校验用户名和密码
			Subject subject = SecurityUtils.getSubject();
			// 钉钉登录
			ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true);
			ShiroToken atoken = new ShiroToken(com.getId(),mobile, null,true,false);
			subject.login(atoken);
			LoginUserInfo loginUser =(LoginUserInfo)subject.getPrincipal();
			loginUser.getCompanyUser().setName(user.getName());
			@@ -554,4 +552,7 @@
			}
			}




			}