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

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

Browse Source
This commit is contained in:
yuezhihang
2022-01-17 16:37:42 +08:00
parent c2ddb5a92b 728cd5d48f
commit 4a4b99ad1c
6 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+3
View File
@@ -74,4 +74,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List<String> list);
List<String> selectIdFormDTBZH(String DTBZHCode);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+2
View File
@@ -134,6 +134,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
selectFieldMap.put("country","COUNTRY");
selectFieldMap.put("standSort","STANDCLASSIFY");
selectFieldMap.put("standState","STANDSTATE");
selectFieldMap.put("standNature","STANDNATURE");
} else if (SarTypeEnum.INLAND_LAWS.getValue().equals(sarType) || SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) {
selectFieldMap = InitStandAttrUtil.selectFieldMapLaws;
selectFieldMap.put("isRelateAccess","SHIFOUGL");
@@ -149,6 +150,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
if (StringUtils.isNotBlank(selVal)) {
value = getSelectionValueName(selVal,value);
} else {
//变更字段是否是文件
List<String> fileList = new ArrayList<>();
if (SarTypeEnum.INLAND_STAND.getValue().equals(sarType) || SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) {
fileList = InitStandAttrUtil.fileFieldList;
adc-da-slrs/src/main/java/com/adc/da/slrs/sysInfo/service/SysInfoEOService.java
+2 -2
View File
@@ -62,7 +62,7 @@ public class SysInfoEOService {
String[] idArr = userIds.split(",");
userNames = userEODao.getNamesByIds(idArr);
if (StringUtils.isBlank(userNames) || "null".equals(userNames)) {
userNames = "";
userNames = userIds;
}
}
return userNames;
@@ -81,7 +81,7 @@ public class SysInfoEOService {
String[] idArr = orgIds.split(",");
names = orgEODao.getNamesByIds(idArr);
if (StringUtils.isBlank(names) || "null".equals(names)) {
names = "";
names = orgIds;
}
}
return names;