| @@ -109,9 +109,9 @@ public class WxUserGrantController extends BaseController { | |||||
| token = user1.getToken(); | token = user1.getToken(); | ||||
| user1.setRegisterIp(ipaddress); | user1.setRegisterIp(ipaddress); | ||||
| user1.setSessionKey(session_key); | user1.setSessionKey(session_key); | ||||
| if (user1.getSceneAddress() == null) | |||||
| if (user1.getSceneAddress() == null || user1.getSceneAddress().equals("undefined")) | |||||
| user1.setSceneAddress(sceneAddress); | user1.setSceneAddress(sceneAddress); | ||||
| if (user1.getScene() == null) | |||||
| if (user1.getScene() == null || user1.getScene().equals("undefined")) | |||||
| user1.setScene(scene); | user1.setScene(scene); | ||||
| if (!StringUtils.isBlank(longitude)) | if (!StringUtils.isBlank(longitude)) | ||||
| user.setLongitude(BigDecimal.valueOf(Double.valueOf(longitude))); | user.setLongitude(BigDecimal.valueOf(Double.valueOf(longitude))); | ||||
| @@ -124,9 +124,9 @@ public class WxUserGrantController extends BaseController { | |||||
| user.createToken(new Date()); | user.createToken(new Date()); | ||||
| token = user.getToken(); | token = user.getToken(); | ||||
| user.setRegisterIp(ipaddress); | user.setRegisterIp(ipaddress); | ||||
| if (user.getSceneAddress() == null) | |||||
| if (user.getSceneAddress() == null || user1.getSceneAddress().equals("undefined")) | |||||
| user.setSceneAddress(sceneAddress); | user.setSceneAddress(sceneAddress); | ||||
| if (user.getScene() == null) | |||||
| if (user.getScene() == null || user1.getScene().equals("undefined")) | |||||
| user.setScene(scene); | user.setScene(scene); | ||||
| user.setSessionKey(session_key); | user.setSessionKey(session_key); | ||||
| if (!StringUtils.isBlank(longitude)) | if (!StringUtils.isBlank(longitude)) | ||||