选择小区修改添加商品修改

jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml

@@ -2,7 +2,7 @@
 server:
   tomcat:
     uri-encoding: UTF-8 #tomcat编码
-  port: 30000 #tomcat端口
+  port: 50000 #tomcat端口
 
 spring:
   devtools: #spring开发者工具模块
@@ -17,11 +17,11 @@ spring:
   exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
   datasource:
     db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
-    host: 192.168.0.210
-    port: 3306
-    username: java_boot_test
-    password: pBx5HaW6WMGSTdDf
-    db-name: java_boot_test
+    host: 222.71.165.188
+    port: 3309
+    username: root
+    password: linus,.123
+    db-name: ningxia_pro
     db-schema: #金仓达梦选填
     prepare-url: #自定义url
 
@@ -43,10 +43,10 @@ spring:
   # ===================== Redis配置 =====================
   # redis单机模式
   redis:
-    database: 1 #缓存库编号
-    host: 192.168.0.220
+    database: 0 #缓存库编号
+    host: 222.71.165.187
     port: 6379
-    password: 123456  # 密码为空时，请将本行注释
+    password: qawsed,.123  # 密码为空时，请将本行注释
     timeout: 3000 #超时时间(单位：秒)
     lettuce: #Lettuce为Redis的Java驱动包
       pool:

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxPriceServiceImpl.java

@@ -495,11 +495,11 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
         }
         //主表字段验证
         //子表字段验证
-        if (form.getNxPriceProductList()!=null||form.getNxPriceProductList().size()>0){
+        if (form.getNxPriceProductList()==null||form.getNxPriceProductList().size()==0){
             return "商品名称不能为空";
 
         }
-        if (form.getNxPriceRecycleList()!=null||form.getNxPriceProductList().size()>0){
+        if (form.getNxPriceRecycleList()==null||form.getNxPriceProductList().size()==0){
             return "回收站不能为空";
         }
         return countRecover;

jnpf-java-boot/jnpf-web/src/views/publicPopup/housingEstateBox.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="选择商品"
+    title="选择小区"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="JNPF-dialog JNPF-dialog_center"