Merge remote-tracking branch 'origin/master'

2 months ago · 0f577038e4
parent 945f73a84e 10919af34a
commit 0f577038e4
1 changed files with 1 additions and 1 deletions
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
@ -147,8 +147,8 @@ public class QcCheckReportProduceController extends BaseController {
        }else{
            bytes.add(null);
        }
-        Matcher matcher3 = pattern.matcher(detailInfo.getPgy());//机管员
        if(StringUtils.isNotBlank(detailInfo.getPgy())){
+            Matcher matcher3 = pattern.matcher(detailInfo.getPgy());//机管员
            // 查找匹配项
            if (matcher3.find()) {
                // 提取括号内的内容，即id=和&fileName之间的部分