|
@ -1005,10 +1005,10 @@ public class BaseMenuManageService {
|
|
|
*/
|
|
|
public List<Map<String,Object>> selectMenuList(String userCode,Integer flag,Integer status){
|
|
|
String sql = "SELECT\n" +
|
|
|
"\tkad.category_first as categoryFirst,\n" +
|
|
|
"\tkad.category_first_name as categoryFirstName,\n" +
|
|
|
"\tkad.category_second as categorySecond,\n" +
|
|
|
"\tkad.category_second_name as categorySecondName \n" +
|
|
|
"\tkad.category_first as \"categoryFirst\",\n" +
|
|
|
"\tkad.category_first_name as \"categoryFirstName\",\n" +
|
|
|
"\tkad.category_second as \"categorySecond\",\n" +
|
|
|
"\tkad.category_second_name as \"categorySecondName\" \n" +
|
|
|
"FROM\n" +
|
|
|
"\twlyy_knowledge_article_user kau\n" +
|
|
|
"LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code\n" +
|
|
@ -1045,22 +1045,22 @@ public class BaseMenuManageService {
|
|
|
* @return
|
|
|
*/
|
|
|
public JSONObject selectArticleListByCategory(String categoryFirst,String categorySecond,String userCode,Integer flag,Integer status,Integer page,Integer size){
|
|
|
String sql = "SELECT kad.category_first as categoryFirst,\n" +
|
|
|
"\tkad.category_first_name as categoryFirstName,\n" +
|
|
|
"\tkad.category_second as categorySecond,\n" +
|
|
|
"\tkad.category_second_name as categorySecondName,\n" +
|
|
|
"\tkad.id as id,\n" +
|
|
|
"\tkad.title as title,\n" +
|
|
|
"\tkad.intro as intro,\n" +
|
|
|
"\tkad.content as content,\n" +
|
|
|
"\tkad.image as image,\n" +
|
|
|
"\tkad.img as img,\n" +
|
|
|
"\tkad.puplish_type as puplishType,\n" +
|
|
|
"\tkad.puplish_type_name as puplishTypeName,\n" +
|
|
|
"\tkad.vedio_url as vedioUrl,\n" +
|
|
|
"\tkad.create_user as createUser,\n" +
|
|
|
"\tkad.create_user_name as createUserName,\n" +
|
|
|
"\tkad.source as source \n" +
|
|
|
String sql = "SELECT kad.category_first as \"categoryFirst\",\n" +
|
|
|
"\tkad.category_first_name as \"categoryFirstName\",\n" +
|
|
|
"\tkad.category_second as \"categorySecond\",\n" +
|
|
|
"\tkad.category_second_name as \"categorySecondName\",\n" +
|
|
|
"\tkad.id as \"id\",\n" +
|
|
|
"\tkad.title as \"title\",\n" +
|
|
|
"\tkad.intro as \"intro\",\n" +
|
|
|
"\tkad.content as \"content\",\n" +
|
|
|
"\tkad.image as \"image\",\n" +
|
|
|
"\tkad.img as \"img\",\n" +
|
|
|
"\tkad.puplish_type as \"puplishType\",\n" +
|
|
|
"\tkad.puplish_type_name as \"puplishTypeName\",\n" +
|
|
|
"\tkad.vedio_url as \"vedioUrl\",\n" +
|
|
|
"\tkad.create_user as \"createUser\",\n" +
|
|
|
"\tkad.create_user_name as \"createUserName\",\n" +
|
|
|
"\tkad.source as \"source\" \n" +
|
|
|
"FROM\n" +
|
|
|
"\twlyy_knowledge_article_user kau\n" +
|
|
|
"LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code \n" +
|
|
@ -1160,18 +1160,18 @@ public class BaseMenuManageService {
|
|
|
String orderBy = " order by create_time desc ";
|
|
|
String condition = " ";
|
|
|
String sql = "SELECT\n" +
|
|
|
"\tid,\n" +
|
|
|
"\tbase_article_doctor_id baseArticleDoctorId,\n" +
|
|
|
"\trelation_code AS relationCode,\n" +
|
|
|
"\trelation_type AS relationType,\n" +
|
|
|
"\tuser,\n" +
|
|
|
"\tuser_name AS userName,\n" +
|
|
|
"\ttype,\n" +
|
|
|
"\tid as \"id\",\n" +
|
|
|
"\tbase_article_doctor_id as \"baseArticleDoctorId\",\n" +
|
|
|
"\trelation_code AS \"relationCode\",\n" +
|
|
|
"\trelation_type AS \"relationType\",\n" +
|
|
|
"\tuser as \"user\",\n" +
|
|
|
"\tuser_name AS \"userName\",\n" +
|
|
|
"\ttype as \"type\",\n" +
|
|
|
"\tdate_format(\n" +
|
|
|
"\t\tcreate_time,\n" +
|
|
|
"\t\t'%Y-%m-%d %H:%i:%S'\n" +
|
|
|
"\t) AS createTime,\n" +
|
|
|
"\tcontent\n" +
|
|
|
"\t) AS \"createTime\",\n" +
|
|
|
"\tcontent as \"content\"\n" +
|
|
|
"FROM\n" +
|
|
|
"\tbase_knowledge_article_doctor\n" +
|
|
|
"WHERE\n" +
|