FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request !86
This commit is contained in:
super_liu
2021-08-02 03:07:45 +00:00
parent 0cbc935da1 d83c7359da
commit b230a49783
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+6 -6
View File
@@ -3,7 +3,7 @@
# 数据库配置 # 数据库配置
#============================================= #=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver 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://10.96.10.171: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.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root spring.datasource.username = root
spring.datasource.password = root spring.datasource.password = root
@@ -14,10 +14,10 @@ spring.application.name=FotonLAWSSystem
application.code=20200101 application.code=20200101
application.center=1 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://101.36.227.25:8761/eureka/
#============================================== #==============================================
# 邮箱配置1 # 邮箱配置1
@@ -64,4 +64,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/
# OCR文件请求下载或在线预览时URL # OCR文件请求下载或在线预览时URL
OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.ocrDownPath=http://106.2.13.189:8089/downfile/
OCR.times=20 OCR.times=20
OCR.convertType=BOTH OCR.convertType=BOTH
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/entity/SarStandMenu.java
+7 -4
View File
@@ -45,13 +45,16 @@ public class SarStandMenu extends BaseEntity {
@TableField("VALID_FLAG") @TableField("VALID_FLAG")
private Integer validFlag; private Integer validFlag;
@Transient @TableField(exist = false)
private String oldMenuId; private String oldMenuId;
@Transient
@TableField(exist = false)
private String standType; private String standType;
@Transient
@TableField(exist = false)
private String[] idlist; private String[] idlist;
@Transient
@TableField(exist = false)
private List<String> menuIds; private List<String> menuIds;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+3 -1
View File
@@ -157,7 +157,9 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
page.setAdvanceSearchStr(null); page.setAdvanceSearchStr(null);
} }
} }
page.setUserId(LoginUserUtil.getUserId()); if(page.getUserId() == null || page.getUserId().equals("")){
page.setUserId(LoginUserUtil.getUserId());
}
List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
return Result.success(getPageInfo(page.getPager(), rows)); return Result.success(getPageInfo(page.getPager(), rows));
} }