--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/SaveUserForm.java

@@ -6,7 +6,7 @@ import lombok.Data;
 @Data
 @ApiModel(value="SaveUserForm",description="绑定用户")
 public class SaveUserForm {
-	@ApiModelProperty("code")
+	@ApiModelProperty("授权码")
 	private String code;
 	@ApiModelProperty("原创首发作者，1企鹅号，2微信公众账号，3头条号，4大鱼号，5一点号，6百家号，7网易号")
 	private Integer original_author;

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/ContetPublishForm.java

@@ -26,9 +26,7 @@ public class ContetPublishForm {
 	private Integer resourceType;
 	@ApiModelProperty("原创首发作者，1企鹅号，2微信公众账号，3头条号，4大鱼号，5一点号，6百家号，7网易号")
 	private List<String> original_author;
-	@ApiModelProperty("授权码")
-	private String code;
-	@ApiModelProperty("绑定账号")
-	private List<String> accountId;
+/*	@ApiModelProperty("绑定账号")
+	private List<String> accountId;*/
 
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/user/UserController.java

@@ -223,18 +223,29 @@ public class UserController {
 			//{"access_token": "8521834b4553b7f5675c7c515ede6c6b","refresh_token": "273491a05edc6440cc2f449ed5183ea7","expires_in": "2017-12-27 16:05:34","user_id": "boniutest3@163.com"}
 			user_id = jsonobj_token.getString("user_id");
 		}
-		UserAccountRelation relation = new UserAccountRelation();
-		relation.setCreationTime(new Date());
-		relation.setAccountName(user_id);
-		relation.setUserId(redis.getUser().getUserId());
-		relation.setStatus(0);
-		if(form.getOriginal_author().equals(1)){
-			relation.setTopImg("20619c3852864612b221c476e5323cfe");
-		}else if(form.getOriginal_author().equals(7)){
-			relation.setTopImg("8e88430d5af34fa7a2d83ea253cbeeb7");
+		accountRelationService.createCriteria().andEqualTo("accountName", user_id);
+		UserAccountRelation oneByCriteria = accountRelationService.selectOneByCriteria();
+		if(oneByCriteria==null){
+			UserAccountRelation relation = new UserAccountRelation();
+			relation.setCreationTime(new Date());
+			relation.setUserId(redis.getUser().getUserId());
+			relation.setStatus(0);
+			if(form.getOriginal_author().equals(1)){
+				relation.setTopImg("20619c3852864612b221c476e5323cfe");
+			}else if(form.getOriginal_author().equals(7)){
+				relation.setTopImg("8e88430d5af34fa7a2d83ea253cbeeb7");
+			}
+			relation.setAccess_token(access_token);
+			relation.setAccountName(user_id);
+			relation.setOriginal_author(form.getOriginal_author());
+			accountRelationService.insert(relation);
+		}else{
+			oneByCriteria.setUserId(redis.getUser().getUserId());
+			oneByCriteria.setAccountName(user_id);
+			oneByCriteria.setAccess_token(access_token);
+			accountRelationService.updateByCriteria(oneByCriteria);
 		}
-		relation.setAccess_token(access_token);
-		accountRelationService.insert(relation);
+		
 		return CallBack.success();
 	}
 	@ApiOperation(value = "删除关联账号", notes = "删除关联账号")