--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -103,7 +103,6 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,Intege
 			label.setObjectId(entity.getId());
 			labelMapper.delete(label);
 		}
-		entity = audioMapper.selectByPrimaryKey(entity.getId());
 		// 维护合同的关联关系
 		if (StringUtils.isNotBlank(form.getRelatedContracts())) {
 			Copyright copyright = copyrightService.selectByPrimaryKey(form.getRelatedContracts());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/clauseLibrary/ClauseLibraryServiceImpl.java

@@ -99,8 +99,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 		}
 		// 保存条文库
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		String objectId = form.getId();
-		if (objectId == null) {
+		if (form.getId() == null) {
 			// 添加
 			BeanUtils.copyProperties(form, entity);
 			entity.setUploadTime(new Date());
@@ -166,7 +165,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 			// 更新
 			entity = mapper.selectByPrimaryKey(form.getId());
 			BeanUtils.copyProperties(form, entity);
-			entity.setId(objectId);
+			entity.setId(entity.getId());
 			entity.setUpdateTime(new Date());
 			if(form.getPdfResourceType()!=null ){
 				if(form.getPdfResourceType().equals(1)){
@@ -235,14 +234,13 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 			}
 			// 删除此对象的所有关系数据
 			ClauseGoods goods = new ClauseGoods();
-			goods.setObjectId(objectId);
+			goods.setObjectId(entity.getId());
 			goodsMapper.delete(goods);
 
 			ClauseLibraryLabel label = new ClauseLibraryLabel();
-			label.setObjectId(objectId);
+			label.setObjectId(entity.getId());
 			labelMapper.delete(label);
 		}
-		objectId = form.getId();
 		// 保存商品信息
 		ClauseGoods goods = new ClauseGoods();
 		BeanUtils.copyProperties(form, goods);
@@ -252,7 +250,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 		if (StringUtils.isNotBlank(form.getEndDate())) {
 			goods.setEndDate(sdf.parse(form.getEndDate()));
 		}
-		goods.setObjectId(objectId);
+		goods.setObjectId(entity.getId());
 		if (goodsMapper.insert(goods) != 1) {
 			throw new BaseException(7, "商品信息保存失败");
 		}
@@ -264,7 +262,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 				List<CopyrightResource> resource2 = copyrightResourceService.selectByCriteria();
 				if(resource2!=null && resource2.size()>0){
 					CopyrightResource resource = new CopyrightResource();
-					resource.setObjectId(objectId);
+					resource.setObjectId(entity.getId());
 					resource.setType(entity.getResourceType());
 					copyrightResourceService.resouctSave(resource, copyright);
 					resource.setCopyrightId(copyright.getId());
@@ -278,7 +276,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 		diyTypeForm.setCode(form.getDiyTypeCode());
 		diyTypeForm.setDtId(form.getDiyTypeId());
 		List<String> objectIdList = new ArrayList<String>();
-		objectIdList.add(objectId);
+		objectIdList.add(entity.getId());
 		diyTypeForm.setObjectId(objectIdList);
 		diyTypeService.updateDiyType(diyTypeForm);
 		// 保存标签
@@ -286,7 +284,7 @@ public class ClauseLibraryServiceImpl extends BaseServiceImpl<ClauseLibrary, Int
 		if(form.getLabelId().size()>0){
 			for (int i = 0; i < form.getLabelId().size(); i++) {
 				ClauseLibraryLabel obj = new ClauseLibraryLabel();
-				obj.setObjectId(objectId);
+				obj.setObjectId(entity.getId());
 				obj.setLabelId(form.getLabelId().get(i));
 				obj.setLabelContentId(form.getLabelContentId().get(i));
 				obj.setLabelContentCode(form.getLabelContentCode().get(i));

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/statuteLibrary/StatuteLibraryServiceImpl.java

@@ -252,7 +252,6 @@ public class StatuteLibraryServiceImpl extends BaseServiceImpl<StatuteLibrary, I
 			label.setObjectId(objectId);
 			labelMapper.delete(label);
 		}
-		entity = mapper.selectByPrimaryKey(entity.getId());
 		// 保存商品信息
 		StatuteGoods goods = new StatuteGoods();
 		BeanUtils.copyProperties(form, goods);