正式环境代码与git管理工具不一致导致文件异常
This commit is contained in:
parent
136df6e8df
commit
a76dd77470
@ -224,7 +224,7 @@ public class ToPageService extends ActionWeb {
|
||||
fileMap.put("nodeType", nodeType);
|
||||
fileMaps.add(fileMap);
|
||||
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PUBDEPT,PLPARENTID,PLMETHODID,POLICYTYPE,FILESTATE,VIEWCOUNT FROM BO_EU_PAL_FILE1 WHERE PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy' OR PLMETHODID='data.form'");
|
||||
List<RowMap> fileRowMaps =null;
|
||||
List<RowMap> fileRowMaps =new LinkedList<>();
|
||||
//List<RowMap> fileRowMaps = DBSql.getMaps("SELECT FILEID,PLPARENTID,PLNAME,PLMETHODID,SUPPORTFILE,PUBDEPT,PUBDATETIME,PLORDERINDEX,PLLEVEL,POLICYTYPE FROM BO_EU_PAL_FILE1 WHERE PLPARENTID=? AND FILESTATE='1' AND (PLMETHODID='process.epc' OR PLMETHODID='process.flowchart' OR PLMETHODID='control.policy') ORDER BY TO_NUMBER(PLLEVEL) ASC, TO_NUMBER(PLORDERINDEX) ASC", sqlParams);
|
||||
if (sb.contains("'")){
|
||||
fileRowMaps = DBSql.getMaps("SELECT ID AS FILEID,PLPARENTID,PLNAME,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE,EXT6 FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLPARENTID=? AND ISPUBLISH = 1 "+
|
||||
@ -445,7 +445,6 @@ public class ToPageService extends ActionWeb {
|
||||
returnString=sb.toString();
|
||||
return returnString;
|
||||
}
|
||||
|
||||
private static String getAppendOrAndInStringLike(List<String> list){
|
||||
StringBuffer sb=new StringBuffer();
|
||||
String returnString="";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user