完成协议ip国际化,权限控制

更改分类/性质/标签,地域/运营商/作用域 ,特定服务,协议ip 修改操作由可选多项仅只修改第一项改为 只能选择一条数据,修订校验国际化
This commit is contained in:
zhangshilin
2018-03-29 18:45:37 +08:00
parent 99175da3f2
commit 0633a74024
15 changed files with 228 additions and 310 deletions

View File

@@ -143,22 +143,13 @@ public class ServiceDictInfoController extends BaseController {
*/
@RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value={"form"})
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType, String mulitId) {
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) {
if(doAction!=null&&doAction.equals("0")){
return "/basics/serviceDictInfo";
}
Integer id=0;
if(mulitId!=null){
String[] ids = mulitId.split(",");
id = Integer.valueOf(ids[0]);
}
if(id!=0){
serviceDictInfo = serviceDictInfoService.getDictById(id);
}
if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null||serviceDictInfo.getParent().getServiceDictId() == 0) {
if (serviceDictInfo==null||serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null) {
ServiceDictInfo parent = new ServiceDictInfo();
parent.setServiceDictId(0);
parent.setItemValue("root_node");
serviceDictInfo.setParent(parent);
}
String[] strArr = itType.split("-");
@@ -422,7 +413,7 @@ public class ServiceDictInfoController extends BaseController {
* 查出所该节点下有树形子节点
*/
void allTreeNode(Integer levelNo, List<ServiceDictInfo> list,List<ServiceDictInfo> resultList){
public void allTreeNode(Integer levelNo, List<ServiceDictInfo> list,List<ServiceDictInfo> resultList){
if(list!=null&&list.size()>0){
for(ServiceDictInfo se:list){
se.setLevelNo(levelNo+1);