--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/content/SignLanguageController.java

@@ -244,6 +244,10 @@ public class SignLanguageController {
 				}
 			}
 		}
+		//分发用户成功调用修改采集主题，修改主题状态
+		if(b) {
+			this.updateSignLanguageStatus(form);
+		}
 		//消息埋点
 		Notice notice = new Notice();
 		notice.setContent(userRelation.getUserName()+"您好,您收到一个新的采集任务,快去看看吧~");
@@ -254,12 +258,6 @@ public class SignLanguageController {
 		notice.setType(1);
 		notice.setStatus(0);
 		fgNoticeService.save(notice);
-		
-		
-		//分发用户成功调用修改采集主题，修改主题状态
-		if(b) {
-			this.updateSignLanguageStatus(form);
-		}
 		return CallBack.success();
 	}
 	@ApiOperation(value = "用户返回", notes = "用户返回")
@@ -366,7 +364,7 @@ public class SignLanguageController {
 		//主题表修改成功后修改主题关联的状态表
 		SignLanguageUserRelation userRelation = userRelationService.selectByPrimaryKey(form.getId());
 		
-		if(userRelation.getRole().equals(2) || userRelation.getType().equals(1)) {
+		if(userRelation.getRole().equals(2)) {
 			Example ex =signLanguageRelationService.createExample();
 			ex.createCriteria().andEqualTo("objectId", form.getObjectId()).andEqualTo("userId", userRelation.getUserId());
 			SignLanguageRelation relation = signLanguageRelationService.selectOneByExample(ex);