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

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

@@ -30,6 +30,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	private SysUser sysDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private Integer levelNo; //层级
+	private Integer isInitianlize; //是否为初始化数据 0：否  1：是  
 	private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
 	
     private Date beginDate;		// 开始日期
@@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	public void setConditionType(List<Integer> conditionType) {
 		this.conditionType = conditionType;
 	}
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
 	@JsonIgnore
 	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){

src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml

@@ -43,7 +43,8 @@
 		s.creator_id AS "sysDictCreator.id",
 		s.create_time AS createTime,
 		s.editor_id AS "sysDictEditor.id",
-		s.edit_time AS editTime
+		s.edit_time AS editTime,
+		s.is_initianlize AS isInitianlize
 	</sql>
 	
 	   	<sql id="menuJoins">

src/main/java/com/nis/web/service/basics/SysDictInfoService.java

@@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{
     	  sysDictInfo.setCreateTime(new Date());
     	  sysDictInfo.setSysDictEditor(user);
     	  sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
+    	  sysDictInfo.setIsInitianlize(0);//是否为初始化数据，默认为0：否
     	  sysDictInfoDao.insertDict(sysDictInfo);
     	  
 		}