Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1097,9 +1097,10 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             if (!CollectionUtils.isEmpty(filter.getDistribute())) {
                 info.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
             }
+            // 将当前uu设置
+            enUU = filter.getEnUU();
             if (!StringUtils.isEmpty(filter.getIsAll()) && filter.getIsAll() == 0 && !StringUtils.isEmpty(filter.getEnUU())) {
                 info.expression(PredicateUtils.ne("inquiry.enUU", filter.getEnUU(), false));
-                enUU = filter.getEnUU();
             }
             if (!StringUtils.isEmpty(filter.getKeyword())) {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);