From ac326c1db9de13a81d8b807276689df88486307d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Dec 2023 14:42:50 +0800
Subject: [PATCH] chore:测试提交

---
 screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java                |    3 ---
 screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index 35a9cdd..0cbe0c8 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -306,7 +306,6 @@
         StringBuilder builder = new StringBuilder();
 
         int i = 1;
-        long timestamp = System.currentTimeMillis();
         for (String string : strings) {
             DustForm dustForm = new DustForm();
             ArrayList<Double> doubleArrayList = new ArrayList<>();
@@ -366,8 +365,6 @@
                 }
             }
         }
-        long timestamp2 = System.currentTimeMillis();
-        log.info(timestamp2-timestamp+"");
         //������
         list1.sort(Comparator.comparing(DustForm::getValue).reversed());
         rsMap.put("list1",list1);
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
index cc9489c..753a2ce 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
@@ -79,7 +79,7 @@
     public Map<String, Object> selectUnit(Map<String, Object> parameters) {
         QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
         wrapper.eq("is_del",Constants.NOT_DELETE);
-        wrapper.eq("is_invalid",0);
+//        wrapper.eq("is_invalid",0);
         int page = Integer.parseInt(parameters.get("page").toString());
         int size = Integer.parseInt(parameters.get("size").toString());
         Object parentName1 = parameters.get("parentCode");

--
Gitblit v1.8.0