|
@@ -57,36 +57,40 @@ public class OtherController {
|
|
|
|
|
|
|
|
@RequestMapping(value = "/bindEnterprise")
|
|
@RequestMapping(value = "/bindEnterprise")
|
|
|
public String bindEnterprise(@RequestParam(required = false) String enterprise, @RequestParam(required = false) String token) {
|
|
public String bindEnterprise(@RequestParam(required = false) String enterprise, @RequestParam(required = false) String token) {
|
|
|
- if (enterprise != null && enterprise.isEmpty()) enterprise = null;
|
|
|
|
|
- if (!authService.checkToken(token)) {
|
|
|
|
|
- return MessageManage.error(-1, "请提供有效token");
|
|
|
|
|
- }
|
|
|
|
|
- JSONObject userContent = authService.getUserContentByToken(token);
|
|
|
|
|
- String usercode = userContent.getString(RESPONSE_FIELD_USERNAME);
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ if (enterprise != null && enterprise.isEmpty()) enterprise = null;
|
|
|
|
|
+ if (!authService.checkToken(token)) {
|
|
|
|
|
+ return MessageManage.error(-1, "请提供有效token");
|
|
|
|
|
+ }
|
|
|
|
|
+ JSONObject userContent = authService.getUserContentByToken(token);
|
|
|
|
|
+ String usercode = userContent.getString(RESPONSE_FIELD_USERNAME);
|
|
|
|
|
|
|
|
- //更新dms记录
|
|
|
|
|
- List<JSONObject> userJsons = dMSService.getUserJSONByCode(usercode, authService.getTokenOfServiceAccount());
|
|
|
|
|
- if (!userJsons.isEmpty()) {
|
|
|
|
|
- JSONObject userJSON = userJsons.get(0);
|
|
|
|
|
- User user = JSONObject.toJavaObject(userJSON, User.class);
|
|
|
|
|
- if (userJSON != null) {
|
|
|
|
|
- user.setCGlGs(enterprise);
|
|
|
|
|
- if ("4".equals(user.getCType())&&enterprise!=null) {
|
|
|
|
|
- user.setCType("3");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ //更新dms记录
|
|
|
|
|
+ List<JSONObject> userJsons = dMSService.getUserJSONByCode(usercode, authService.getTokenOfServiceAccount());
|
|
|
|
|
+ if (!userJsons.isEmpty()) {
|
|
|
|
|
+ JSONObject userJSON = userJsons.get(0);
|
|
|
|
|
+ User user = JSONObject.toJavaObject(userJSON, User.class);
|
|
|
|
|
+ if (userJSON != null) {
|
|
|
|
|
+ user.setCGlGs(enterprise);
|
|
|
|
|
+ if ("4".equals(user.getCType())&&enterprise!=null) {
|
|
|
|
|
+ user.setCType("3");
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- if ("3".equals(user.getCType())&&enterprise==null) {
|
|
|
|
|
- user.setCType("4");
|
|
|
|
|
|
|
+ if ("3".equals(user.getCType())&&enterprise==null) {
|
|
|
|
|
+ user.setCType("4");
|
|
|
|
|
+ }
|
|
|
|
|
+ dMSService.updateToDms(Collections.singletonList(userJSON), authService.getTokenOfServiceAccount(), DMSColumn.USER);
|
|
|
}
|
|
}
|
|
|
- dMSService.updateToDms(Collections.singletonList(userJSON), authService.getTokenOfServiceAccount(), DMSColumn.USER);
|
|
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- if (enterprise == null) {
|
|
|
|
|
- authService.deUpgradeRoleEnterprise(userContent);
|
|
|
|
|
- return MessageManage.successWithNoData("成功解除此用户的相关绑定");
|
|
|
|
|
- } else {
|
|
|
|
|
- authService.upgradeRoleEnterprise(userContent);
|
|
|
|
|
- return MessageManage.successWithNoData("成功绑定到对应企业");
|
|
|
|
|
|
|
+ if (enterprise == null) {
|
|
|
|
|
+ authService.deUpgradeRoleEnterprise(userContent);
|
|
|
|
|
+ return MessageManage.successWithNoData("成功解除此用户的相关绑定");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ authService.upgradeRoleEnterprise(userContent);
|
|
|
|
|
+ return MessageManage.successWithNoData("成功绑定到对应企业");
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (RuntimeException e) {
|
|
|
|
|
+ return MessageManage.error(-1,e.getMessage());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|