Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-main/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root
@@ -14,10 +14,10 @@ spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
-##Eruept
+#Eruept
-#eureka.client.allow-redirects=true
+eureka.client.allow-redirects=true
-#eureka.client.register-with-eureka=true
+eureka.client.register-with-eureka=true
-#eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
+eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
 
 #==============================================
 # 邮箱配置1

adc-da-main/src/main/resources/application.properties

@@ -39,7 +39,7 @@ eureka.client.fetch-registry=true
 #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
 
-eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
+eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
 
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java

@@ -45,13 +45,16 @@ public class SarStandMenu extends BaseEntity {
     @TableField("VALID_FLAG")
     private Integer validFlag;
 
-    @Transient
+    @TableField(exist = false)
     private String oldMenuId;
-    @Transient
+
+    @TableField(exist = false)
     private String standType;
-    @Transient
+
+    @TableField(exist = false)
     private String[] idlist;
-    @Transient
+
+    @TableField(exist = false)
     private List<String> menuIds;
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -157,7 +157,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
                 page.setAdvanceSearchStr(null);
             }
         }
-        page.setUserId(LoginUserUtil.getUserId());
+        if(page.getUserId() == null || page.getUserId().equals("")){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }