!173 栏目属性

Merge pull request !173 from Morty/4.7.1

src/main/java/net/mingsoft/cms/action/ColumnAction.java

@@ -9,6 +9,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.mingsoft.basic.util.ArrysUtil;
+import net.mingsoft.mdiy.util.DictUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,6 +86,8 @@ public class ColumnAction extends BaseAction{
 		int appId =BasicUtil.getAppId();
 		List<ColumnEntity> list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
 		ColumnEntity columnSuper = new ColumnEntity();
+		// 栏目属性
+		model.addAttribute("columnFlag", DictUtil.list("栏目属性"));
 		model.addAttribute("appId",appId);
 		model.addAttribute("columnSuper", columnSuper);
 		model.addAttribute("column",new ColumnEntity());
@@ -154,7 +158,7 @@ public class ColumnAction extends BaseAction{
 		columnBiz.updateEntity(column);
 		//生成文件夹
 		File fileName = new File(file);
-        fileName.mkdir();
+		fileName.mkdir();
 	}
 
 	/**
@@ -199,6 +203,8 @@ public class ColumnAction extends BaseAction{
 		list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
 		//查询当前栏目实体
 		ColumnEntity column = (ColumnEntity) columnBiz.getEntity(columnId);
+		// 栏目属性
+		model.addAttribute("columnFlag", DictUtil.list("栏目属性"));
 		model.addAttribute("appId",appId);
 		model.addAttribute("column", column);
 		model.addAttribute("columnc", column.getCategoryId());
@@ -245,6 +251,13 @@ public class ColumnAction extends BaseAction{
 		column.setCategoryManagerId(getManagerBySession(request).getManagerId());
 		column.setCategoryDateTime(new Timestamp(System.currentTimeMillis()));
 		column.setCategoryModelId(BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()));
+		String checkboxType = BasicUtil.getString("checkboxType");
+		//如果选择一个属性不做排序操作
+		if(!StringUtils.isEmpty(checkboxType) && checkboxType.length()>2){
+			column.setColumnFlag(ArrysUtil.sort(checkboxType, ",")+",");
+		}else{
+			column.setColumnFlag(checkboxType);
+		}
 		if(column.getColumnType()==ColumnEntity.ColumnTypeEnum.COLUMN_TYPE_COVER.toInt()){
 			column.setColumnListUrl(null);
 		}
@@ -274,6 +287,13 @@ public class ColumnAction extends BaseAction{
 		}
 		column.setCategoryManagerId(getManagerBySession(request).getManagerId());
 		column.setAppId(websiteId);
+		String checkboxType = BasicUtil.getString("checkboxType");
+		//如果选择一个属性不做排序操作
+		if(!StringUtils.isEmpty(checkboxType) && checkboxType.length()>2){
+			column.setColumnFlag(ArrysUtil.sort(checkboxType, ",")+",");
+		}else{
+			column.setColumnFlag(checkboxType);
+		}
 		columnBiz.updateCategory(column);
 		this.columnPath(request,column);
 		//查询当前栏目是否有子栏目，