Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/domain/basics/ServiceDictInfo.java

@@ -10,6 +10,7 @@ import com.nis.domain.BaseEntity;
 import com.nis.domain.SysMenu;
 import com.nis.domain.SysUser;
 import com.nis.util.Configurations;
+import com.nis.util.StringUtil;
 /**
  * 业务辅助表-业务字典信息表
  * @author zsl
@@ -33,7 +34,6 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private Integer levelNo; //层级
 	private List<ServiceDictInfo> childrenList = new ArrayList<ServiceDictInfo>();//子列表
-	
     private Date beginDate;		// 开始日期
 	private Date endDate;		// 结束日期
 	
@@ -42,14 +42,20 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	
 	private String showSequence;  //显示序号
 	
-	
+	private String pNames;//父节点名称
 	/**
 	 * 封装参数数据类型,
 	 * 
 	 */
 	private List<Integer> conditionType;
 	
-	
+	@JsonIgnore
+	public String getpNames() {
+		return pNames;
+	}
+	public void setpNames(String pNames) {
+		this.pNames = pNames;
+	}
 	public Integer getServiceDictId() {
 		return serviceDictId;
 	}
@@ -250,5 +256,23 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 		
 		
 	}
+	//获取所有父节点
+	@JsonIgnore
+	public static String getPNames(List<ServiceDictInfo> list,Integer pid,String pNames) {
+		String pName="";
+		for (ServiceDictInfo serviceDictInfo : list) {
+			if(pid==serviceDictInfo.getServiceDictId()){
+				pid=serviceDictInfo.getParent().getServiceDictId();
+				pName=serviceDictInfo.getItemValue();
+				pNames="/"+pName+pNames;
+			}
+		}
+		if(pid==0){
+			if(!StringUtil.isEmpty(pNames)) pNames=pNames.substring(1);
+			return pNames;
+		}else{
+			return getPNames(list, pid, pNames);
+		}
+	}
 	
 }