--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/resource/ResourceLibraryController.java

@@ -70,6 +70,7 @@ import com.zrqx.core.util.zip.ZipUtil;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryOneVO;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibrarySubmitVO;
+import com.zrqx.core.vo.sysuser.bg.content.SignLanguageOneVo;
 import com.zrqx.core.vo.sysuser.bg.dept.DeptVO;
 import com.zrqx.sysuser.bg.client.file.FileClient;
 import com.zrqx.sysuser.bg.client.system.SystemClient;
@@ -331,6 +332,8 @@ public class ResourceLibraryController {
 		SignLanguageUserRelation userRelation = new SignLanguageUserRelation();
 		userRelation.setObjectId(vi.getSignLanguageId());
 		userRelation.setUserId(vi.getUserId());
+		//中心管理员为用户角色时，角色为录制人
+		userRelation.setRole(0);
 		userRelation = signLanguageUserRelationService.selectOne(userRelation);
 		if (num > 0) {
 			// 修改主题关联用户表状态
@@ -423,10 +426,13 @@ public class ResourceLibraryController {
 				.andEqualTo("userId", vi.getUserId()).andEqualTo("status_1", LibraryStatusEnum.STATUS_2.getCode());
 		num = service.selectCountByExample(example);
 		// 修改主题关联用户表区域管理员状态
-		SignLanguageUserRelation userRelation = new SignLanguageUserRelation();
-		userRelation.setObjectId(vi.getSignLanguageId());
-		userRelation.setUserId(vi.getUserId());
-		userRelation = signLanguageUserRelationService.selectOne(userRelation);
+		SignLanguageUserRelation userRelation1 = new SignLanguageUserRelation();
+		userRelation1.setObjectId(vi.getSignLanguageId());
+		//userRelation1.setUserId(vi.getUserId());
+		userRelation1.setUserId(vi.getArea_adminId());
+		//系统管理员为用户角色时，角色为录制人
+		userRelation1.setRole(2);
+		SignLanguageUserRelation userRelation = signLanguageUserRelationService.selectOne(userRelation1);
 		// 修改主题关联用户表状态
 		if (num > 0) {
 			userRelation.setStatus_1(SignStatusEnum.NOT_ADOPT.getCode());
@@ -540,7 +546,7 @@ public class ResourceLibraryController {
 		// 添加图组
 		if(ArrayUtils.isNotEmpty(form.getImageList())) {
 			List<ImageLibrary> list = BeanUtils.copyList(form.getImageList(), ImageLibrary.class, ai -> {
-				ai.setImage(li.getImage());
+				ai.setImage(ai.getImage());
 				ai.setVideoId(li.getId());
 				ai.setUploadTime(new Date());
 			});
@@ -551,6 +557,7 @@ public class ResourceLibraryController {
 		this.updateSignLanguageRelationStatus(li);
 		return CallBack.success(true);
 	}
+	
 	@ApiOperation(value = "视频Id查看上传任务详情", notes = "视频Id查看上传任务详情,")
 	@PostMapping(value = ResourceRequestPath.OID)
 	public CallBack<VideoLibrarySubmitVO> selectById(@PathVariable String oid) {

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/content/SignLanguageServiceImpl.java

@@ -278,6 +278,9 @@ public class SignLanguageServiceImpl extends BaseServiceImpl<SignLanguage, Strin
 		SignLanguageUserRelation s = new SignLanguageUserRelation();
 		s.setObjectId(li.getId());
 		s.setUserId(id);
+		if(li.getRole()!=null) {
+			s.setRole(li.getRole());
+		}
 		s =  userRelationMapper.selectOne(s);
 		if(s != null) {
 			if(!s.getRole().equals(0)) {