修改权限

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java

@@ -203,7 +203,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 if (!mongoMerchantUtils.judgeIsPermission(step2Param.getPerformancesId(), step2Param.getMerchantId(), new String[]{
                         MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
                 })) {
-                    if(vo.getMerchantId()!=step2Param.getMerchantId()){
+                    if(!vo.getMerchantId().equals(step2Param.getMerchantId())){
                         return ResponseDto.failure(ErrorMapping.get(29999));
                     }
                 }
@@ -443,14 +443,16 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     @Override
     public ResponseDto<PerformanceStep2Param> getStep2(String performancesId) {
         String merchantId = CurrentUtil.getCurrentUid();
+        PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(performancesId);
+        if (data == null) {
+            return ResponseDto.failure(ErrorMapping.get(20104));
+        }
         if (!mongoMerchantUtils.judgeIsPermission(performancesId,merchantId, new String[]{
                 MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
         })) {
+            if(!data.getMerchantId().equals(merchantId)){
                 return ResponseDto.failure(ErrorMapping.get(29999));
             }
-        PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(performancesId);
-        if (data == null) {
-            return ResponseDto.failure(ErrorMapping.get(20104));
         }
         List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
         List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = ObjectUtil.getTicketTimesTicketCreatePartnerVoList();