接口编写

src/main/resources/application-dev.yml

+spring:
+  datasource:
+    username: syc_dev
+    password: Test123!
+    url: jdbc:mysql://${MYSQL_HOST:116.63.67.122}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true

src/main/resources/application-local.yml

+spring:
+  datasource:
+    username: root
+    password: root
+    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true

src/main/resources/application.yml

 spring:
+  profiles:
+    active:
+      - local
   freemarker:
     cache: false
     template-loader-path: classpath:/templates/ftl/
@@ -21,9 +24,6 @@ spring:
       pool-name: HikariCP
       max-lifetime: 1800000
       connection-timeout: 30000
-    username: root
-    password: root
-    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DB:slm_bi}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true
   messages:
     basename: i18n/messages,i18n/sys
 

src/main/resources/mapper/mysql/panel/InstrumentPanelDraftMapper.xml

@@ -30,7 +30,7 @@
             </foreach>
             )
         </if>
-         and access_permission='public'
+         and access_permission='public' and record_status=1
         union ALL
         select * from instrument_panel_draft where panel_id in
         <if test="panelIds!=null">
@@ -40,7 +40,7 @@
             </foreach>
             )
         </if>
-         and access_permission='private' and IFNULL(updater,creator)=#{userId}
+         and access_permission='private'  and record_status=1 and IFNULL(updater,creator)=#{userId}
         union ALL
         select * from instrument_panel_draft where panel_id in
         <if test="panelIds!=null">
@@ -50,6 +50,6 @@
             </foreach>
             )
         </if>
-         and access_permission='custom' and check_panel_permissions(#{appId},id,#{officeIds},#{userId},#{roleId})>0
+         and access_permission='custom'  and record_status=1 and check_panel_permissions(#{appId},id,#{officeIds},#{userId},#{roleId})>0
     </select>
 </mapper>