소스 검색

Merge branch 'master' into rmd-dev

Rmengdi 10 달 전
부모
커밋
f0e6a52824
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      pdaaphm-admin/src/main/resources/application.yml
  2. 1 1
      pdaaphm-admin/src/main/resources/mapper/system/DataMapper.xml

+ 1 - 1
pdaaphm-admin/src/main/resources/application.yml

@@ -20,7 +20,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8088
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /

+ 1 - 1
pdaaphm-admin/src/main/resources/mapper/system/DataMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPreprocessDataList" parameterType="Data" resultMap="DataResult">
         <include refid="selectDataVo"/>
         <where>
-            data_type in ('1','2','3')
+            data_type in ('0','1','2')
             <if test="dataName != null  and dataName != ''"> and data_name like concat('%', #{dataName}, '%')</if>
             <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>
             <if test="dataPath != null  and dataPath != ''"> and data_path = #{dataPath}</if>