Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -463,6 +463,17 @@ public class CustomerCreditController extends DefaultBaseController {
             List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             data.setShowExamine(businessIds.contains(credit.getId()));
         }
+        // enterpriseOperationType 转中文
+        String opType = data.getEnterpriseOperationType();
+        if ("NEW_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("新开发客户");
+        } else if ("RECONNECT_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("再接轨客户");
+        } else if ("OLD_CUSTOMER".equals(opType)) {
+            data.setEnterpriseOperationType("老客户");
+        } else {
+            data.setEnterpriseOperationType("");
+        }
         return data;
     }
 

@@ -177,7 +177,7 @@
             <choose>
             <when test="vo.queryType == 'REVOKE'">
             AND (tb.revoke_status = '' OR tb.revoke_status = null OR tb.revoke_status='CANCEL' OR
-            tb.revoke_status='PARTIAL')
+            tb.revoke_status='PARTIAL' OR tb.revoke_status IS NULL)
             AND (tb.status='ISSUED' OR tb.status='WAIT' OR tb.status='TRANSIT')
             AND tb.examine_status = 'PASS'
             AND (tb.spec_change_status != 'IN_PROGRESS' OR tb.spec_change_status IS NULL)