企业列表出来了

.idea/workspace.xml

@@ -5,13 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="72651396-d9d2-4022-b080-e21d75d1bedb" name="更改" comment="企业列表出来了">
-      <change afterPath="$PROJECT_DIR$/logs/cloud-system/error.2024-09-02.log" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/cloud-system/error.2024-09-03.log" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/cloud-system/info.2024-09-02.log" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/logs/cloud-system/info.2024-09-03.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/cloud-system/error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/cloud-system/info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/cloud-system/info.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -66,33 +60,33 @@
   <component name="ProjectViewState">
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "RequestMappingsPanelOrder0": "0",
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    "RequestMappingsPanelOrder1": "1",
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    "RequestMappingsPanelWidth0": "75",
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    "RequestMappingsPanelWidth1": "75",
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    "WebServerToolWindowFactoryState": "false",
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    "last_opened_file_path": "E:/桌面/cloud-market/cloud-market-server/src/main/resources/mapper/market",
+    &quot;last_opened_file_path&quot;: &quot;E:/桌面/cloud-market/cloud-market-server/src/main/java/com/muyu/market/controller&quot;,
-    "node.js.detected.package.eslint": "true",
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    "node.js.detected.package.tslint": "true",
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    "node.js.selected.package.eslint": "(autodetect)",
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    "node.js.selected.package.tslint": "(autodetect)",
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    "nodejs_package_manager_path": "npm",
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices",
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.repository.indices&quot;,
-    "spring.configuration.checksum": "647853898192e405c7aff8ecac5564ea",
+    &quot;spring.configuration.checksum&quot;: &quot;647853898192e405c7aff8ecac5564ea&quot;,
-    "vue.rearranger.settings.migration": "true"
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\桌面\cloud-market\cloud-market-server\src\main\resources\mapper\market" />
       <recent name="E:\桌面\cloud-market\cloud-market-server\src\main\java\com\muyu\market\controller" />
       <recent name="E:\桌面\cloud-market\cloud-market-server\src\main\java\com\muyu\market\service\impl" />
       <recent name="E:\桌面\cloud-market\cloud-market-server\src\main\java\com\muyu\market\service" />
+      <recent name="E:\桌面\cloud-market\cloud-market-common\src\main\java\com\muyu\market\domain" />
       <recent name="E:\桌面\cloud-market\cloud-market-server\src\main\java\com\muyu\market\mapper" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -184,6 +178,8 @@
       <workItem from="1725535072504" duration="2640000" />
       <workItem from="1725538502773" duration="4219000" />
       <workItem from="1725553138436" duration="1569000" />
+      <workItem from="1725584707555" duration="7589000" />
+      <workItem from="1725605672086" duration="662000" />
     </task>
     <task id="LOCAL-00001" summary="初始化">
       <created>1724047244829</created>
@@ -444,7 +440,49 @@
       <option name="project" value="LOCAL" />
       <updated>1725554055695</updated>
     </task>
-    <option name="localTasksCounter" value="38" />
+    <task id="LOCAL-00038" summary="企业列表出来了">
+      <created>1725585733423</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1725585733423</updated>
+    </task>
+    <task id="LOCAL-00039" summary="企业列表出来了">
+      <created>1725586040988</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1725586040988</updated>
+    </task>
+    <task id="LOCAL-00040" summary="企业列表出来了">
+      <created>1725586194372</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1725586194372</updated>
+    </task>
+    <task id="LOCAL-00041" summary="企业列表出来了">
+      <created>1725588117779</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1725588117779</updated>
+    </task>
+    <task id="LOCAL-00042" summary="企业列表出来了">
+      <created>1725588352944</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1725588352944</updated>
+    </task>
+    <task id="LOCAL-00043" summary="企业列表出来了">
+      <created>1725591967025</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1725591967025</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

cloud-market-common/src/main/java/com/muyu/market/domain/MyApi.java

@@ -52,7 +52,7 @@ public class MyApi {
 
     /** 使用状态 */
     @Excel(name = "使用状态")
-    private Long myStates;
+    private String myStates;
 
 
 

cloud-market-server/src/main/java/com/muyu/market/service/impl/MyApiServiceImpl.java

@@ -1,6 +1,8 @@
 package com.muyu.market.service.impl;
 
 import java.util.List;
+
+import com.muyu.market.domain.SysDatawarehouse;
 import org.springframework.stereotype.Service;
 import com.muyu.market.mapper.MyApiMapper;
 import com.muyu.market.domain.MyApi;
@@ -56,7 +58,8 @@ public class MyApiServiceImpl
         if (myApi.getMyNum()!=null){
             queryWrapper.eq(MyApi::getMyNum, myApi.getMyNum());
         }
-        if (myApi.getMyStates()!=null){
+
+        if (StringUtils.isNotEmpty(myApi.getMyStates())){
             queryWrapper.eq(MyApi::getMyStates, myApi.getMyStates());
         }
         return this.list(queryWrapper);