Merge branch 'dev_layer0731' into 'develop'

修改

See merge request !312

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessLayerServiceImpl.java

@@ -232,13 +232,14 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
 		// 需要更新为有效的
 		Set<String> updates = new HashSet<>(db);
 		updates.retainAll(skillCodes);
+		if(!updates.isEmpty()) {
 
 			LambdaUpdateWrapper<MapLayerCustomizeSkill> updateWrapper = new LambdaUpdateWrapper<>();
 			updateWrapper.set(MapLayerCustomizeSkill::getStatus, 1);
 			updateWrapper.eq(MapLayerCustomizeSkill::getLayerId, layerId);
 			updateWrapper.in(MapLayerCustomizeSkill::getSkillCode, new ArrayList<>(updates));
 			mapLayerCustomizeSkillMPDao.update(null, updateWrapper);
-
+		}
 
 		// 需要新增插入的
 		Set<String> adds = new HashSet<>(skillCodes);