Bläddra i källkod

fix:套餐区分区分appId查询

ct 4 timmar sedan
förälder
incheckning
fbbaf8dc2d

+ 3 - 3
fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -83,7 +83,7 @@ public interface FsPackageMapper
             "            <if test=\"maps.diseaseType != null \"> and disease_type = #{maps.diseaseType}</if>\n" +
             "            <if test=\"maps.isShow != null \"> and is_show = #{maps.isShow}</if>\n" +
             "            <if test=\"maps.solarTerm != null \"> and solar_term = #{maps.solarTerm}</if>\n" +
-            "            <if test=\"maps.appId != null and maps.appId != ''\"> and (FIND_IN_SET(#{maps.appId}, app_ids) > 0) or app_ids is null or app_ids = ''</if>\n" +
+            "            <if test=\"maps.appId != null and maps.appId != ''\"> and ((FIND_IN_SET(#{maps.appId}, app_ids) > 0) or app_ids is null or app_ids = '')</if>\n" +
             "        order by sort,package_id desc"+
             "</script>"})
 
@@ -126,10 +126,10 @@ public interface FsPackageMapper
             "and p.is_show = #{maps.isShow} " +
             "</if>" +
             "<if test = 'maps.appId != null and maps.appId != \"\"'> " +
-            "and (FIND_IN_SET(#{maps.appId}, app_ids) > 0) or app_ids is null or app_ids = ''" +
+            "and ((FIND_IN_SET(#{maps.appId}, app_ids) > 0) or app_ids is null or app_ids = '')" +
             "</if>" +
             "<if test = 'maps.appId == null or maps.appId == \"\"'> " +
-            "and app_ids is null or app_ids = ''" +
+            "and (app_ids is null or app_ids = '')" +
             "</if>" +
             " order by p.sort desc,package_id  "+
             "</script>"})

+ 1 - 1
fs-service/src/main/resources/application-druid-jnmy-test.yml

@@ -41,7 +41,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://120.46.174.121:2345/fs_his_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://120.46.174.121:2345/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrztek250218!3@.
                 # 从库数据源