|
|
@@ -1,14 +1,12 @@
|
|
|
package com.uas.platform.b2c.common.account.controller;
|
|
|
|
|
|
import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
|
|
|
-import com.uas.platform.b2c.common.account.model.*;
|
|
|
+import com.uas.platform.b2c.common.account.model.User;
|
|
|
+import com.uas.platform.b2c.common.account.model.UserInfo;
|
|
|
+import com.uas.platform.b2c.common.account.model.UserLoginTime;
|
|
|
import com.uas.platform.b2c.common.account.service.RoleService;
|
|
|
import com.uas.platform.b2c.common.account.service.UserService;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
-
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
-
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
import net.sf.ehcache.CacheManager;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -16,9 +14,12 @@ import org.springframework.data.repository.query.Param;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.io.UnsupportedEncodingException;
|
|
|
+import java.net.URLDecoder;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
|
@@ -49,10 +50,9 @@ public class AuthenticationController {
|
|
|
User user = userService.findUserByUserUU(sysUser.getUserUU());
|
|
|
user.setEnterprise(sysUser.getEnterprise());
|
|
|
if (user.getEnterprise() != null ) {
|
|
|
- if (user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
|
|
|
+ if (!StringUtils.isEmpty(user.getEnterprise().getEnAdminuu()) && user.getEnterprise().getEnAdminuu().equals(user.getUserUU())) {
|
|
|
user.setIssys(Constant.YES);
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
user.setIssys(Constant.NO);
|
|
|
}
|
|
|
}
|