Merge branch 'dev' of trick9191/patient-co-management into dev

edu-article/JkEdu/src/com/yihu/jk/api/CategoryApiTest.java

@@ -16,7 +16,7 @@ import net.sf.json.JSONObject;
public class CategoryApiTest {
	public static void main(String[] args){
	public static void main(String[] args)throws Exception{
		// getConfigSys();
		// getArticleORCode();
		addCategory();
@@ -24,22 +24,18 @@ public class CategoryApiTest {
	}
	// 获取系统配置 认证 评论开关
	public static void addCategory(){
	public static void addCategory()throws Exception{
		CategoryApi api = new CategoryApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("categoryId","1");
		obj.put("categoryName","1");
		obj.put("categoryLevel","1");
		obj.put("secondLevelId","1");
		obj.put("firstlevelId","1");
		obj.put("orgName","1");
		obj.put("orgId","1");
		obj.put("operatorName","1");
		obj.put("operatorId","1");
		obj.put("categoryName","内部通知");
		obj.put("categoryLevel","2");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.addCategory(im));
		System.out.println(api.checkCategory(im));
	}

edu-article/JkEdu/src/com/yihu/jk/dao/CategoryDao.java

@@ -52,10 +52,10 @@ public class CategoryDao {
		Sql sql = DB.me().createSql(CategorySqlNameEnum.getCategoryList);
		StringBuffer param = new StringBuffer();
		StringBuffer paramUserId = new StringBuffer();
		if (StringUtil.isNotEmpty(vo.getCategoryLevel())) {
			param.append(" and CategoryName =").append(vo.getCategoryName());
		if (StringUtil.isNotEmpty(vo.getCategoryName())) {
			param.append(" and CategoryName =").append("'"+vo.getCategoryName()+"'");
		}
		if (StringUtil.isNotEmpty(vo.getFirstlevelId())) {
		if (StringUtil.isNotEmpty(vo.getCategoryLevel())) {
			param.append(" and CategoryLevel =").append(vo.getCategoryLevel());
		}
		sql.addVar("@Condition", param.toString());