合并分支 'fix_foton_20230613' 到 'master'

Fix foton 20230613

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!108
This commit is contained in:
高嵩
2023-06-16 17:51:56 +08:00
@@ -172,6 +172,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
if(jsonObject!=null){
Object standName = jsonObject.get("standName");
Object standCode = jsonObject.get("standCode");
Object menuId = jsonObject.get("menuId");
Object treeType = jsonObject.get("treeType");
if(standName!=null){
String standNameInfo = standName.toString();
if(StringUtils.isNotBlank(standNameInfo)){
@@ -184,6 +186,18 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
page.setStandCode(standCodeInfo);
}
}
if(menuId!=null){
String menuIdInfo = menuId.toString();
if(StringUtils.isNotBlank(menuIdInfo)){
page.setMenuId(menuIdInfo);
}
}
if(treeType!=null){
String treeTypeInfo = treeType.toString();
if(StringUtils.isNotBlank(treeTypeInfo)){
page.setTreeType(treeTypeInfo);
}
}
}
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
exportContent = "";