--no commit message

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

@@ -381,7 +381,7 @@ public class SignLanguageController {
 		//主题表修改成功后修改主题关联的状态表
 		SignLanguageUserRelation userRelation = userRelationService.selectByPrimaryKey(form.getId());
 		
-		if(userRelation.getRole().equals(2)) {
+		if(userRelation.getRole().equals(3) && userRelation.getUserType().equals(2)||userRelation.getRole().equals(2)) {
 			Example ex =signLanguageRelationService.createExample();
 			ex.createCriteria().andEqualTo("objectId", form.getObjectId()).andEqualTo("userId", userRelation.getUserId());
 			SignLanguageRelation relation = signLanguageRelationService.selectOneByExample(ex);

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/content/SignLanguageUserRelationMapper.java

@@ -41,7 +41,7 @@ public interface SignLanguageUserRelationMapper extends BaseMapper<SignLanguageU
 	List<SignLanguageORUserVo> userByUserList(@Param("form")QueryUserTypeForm form,@Param("userId")String userId);
 	/** 查询*/
 	@Select("<script>" 
-			+ "SELECT * from sys_sign_language_user_relation where objectId = #{id} and userType=2 and role!=0"
+			+ "SELECT * from sys_sign_language_user_relation where objectId = #{id} and userType=2 and role!=0	"
 			+ "</script>")
 	List<SignLanguageUserRelation> userList(String id);
 	@Select("<script>"