allied-creation / sumifcc-discuss · 提交

转到一个项目

作者 庄敏学
提交 0e4207539fedbf4462f728632142b7597c87fee7 1 个父辈 93f46204

文章列表

内嵌 并排对比
正在显示 4 个修改的文件 包含 89 行增加 和 149 行删除
@@ -321,8 +321,6 @@ @@ -321,8 +321,6 @@
321 ] 321 ]
322 } 322 }
323 }, 323 },
324 -<<<<<<< HEAD  
325 -=======  
326 "v1/mini/article_comment/at_who/list": { 324 "v1/mini/article_comment/at_who/list": {
327 "post": { 325 "post": {
328 "summary": "小程序展示评论时@人可选列表", 326 "summary": "小程序展示评论时@人可选列表",
@@ -465,7 +463,6 @@ @@ -465,7 +463,6 @@
465 ] 463 ]
466 } 464 }
467 }, 465 },
468 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
469 "v1/mini/article_draft": { 466 "v1/mini/article_draft": {
470 "post": { 467 "post": {
471 "summary": "小程序创建文章进草稿箱", 468 "summary": "小程序创建文章进草稿箱",
@@ -603,8 +600,6 @@ @@ -603,8 +600,6 @@
603 "requestBody": {}, 600 "requestBody": {},
604 "tags": [ 601 "tags": [
605 "article" 602 "article"
606 -<<<<<<< HEAD  
607 -=======  
608 ] 603 ]
609 } 604 }
610 }, 605 },
@@ -636,28 +631,11 @@ @@ -636,28 +631,11 @@
636 "required": false, 631 "required": false,
637 "type": "integer", 632 "type": "integer",
638 "format": "int64" 633 "format": "int64"
639 - },  
640 - {  
641 - "name": "articleId",  
642 - "description": " 文章id",  
643 - "in": "query",  
644 - "required": true,  
645 - "type": "integer",  
646 - "format": "int64"  
647 - },  
648 - {  
649 - "name": "tagId",  
650 - "description": " 标签id",  
651 - "in": "query",  
652 - "required": true,  
653 - "type": "integer",  
654 - "format": "int64"  
655 } 634 }
656 ], 635 ],
657 "requestBody": {}, 636 "requestBody": {},
658 "tags": [ 637 "tags": [
659 "article" 638 "article"
660 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
661 ] 639 ]
662 } 640 }
663 }, 641 },
@@ -1634,8 +1612,6 @@ @@ -1634,8 +1612,6 @@
1634 "department" 1612 "department"
1635 ] 1613 ]
1636 }, 1614 },
1637 -<<<<<<< HEAD  
1638 -=======  
1639 "delete": { 1615 "delete": {
1640 "summary": "部门-删除", 1616 "summary": "部门-删除",
1641 "operationId": "systemDelete", 1617 "operationId": "systemDelete",
@@ -1668,7 +1644,6 @@ @@ -1668,7 +1644,6 @@
1668 "department" 1644 "department"
1669 ] 1645 ]
1670 }, 1646 },
1671 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
1672 "put": { 1647 "put": {
1673 "summary": "部门-更新", 1648 "summary": "部门-更新",
1674 "operationId": "systemUpdate", 1649 "operationId": "systemUpdate",
@@ -2094,8 +2069,6 @@ @@ -2094,8 +2069,6 @@
2094 "company" 2069 "company"
2095 ] 2070 ]
2096 }, 2071 },
2097 -<<<<<<< HEAD  
2098 -=======  
2099 "ArticleCommentAndReply": { 2072 "ArticleCommentAndReply": {
2100 "type": "object", 2073 "type": "object",
2101 "properties": { 2074 "properties": {
@@ -2227,7 +2200,6 @@ @@ -2227,7 +2200,6 @@
2227 "content" 2200 "content"
2228 ] 2201 ]
2229 }, 2202 },
2230 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
2231 "ArticleSearchMe": { 2203 "ArticleSearchMe": {
2232 "type": "object", 2204 "type": "object",
2233 "properties": { 2205 "properties": {
@@ -2310,6 +2282,25 @@ @@ -2310,6 +2282,25 @@
2310 "totalComment" 2282 "totalComment"
2311 ] 2283 ]
2312 }, 2284 },
  2285 + "ArticleTagGroup": {
  2286 + "type": "object",
  2287 + "properties": {
  2288 + "group": {
  2289 + "type": "string"
  2290 + },
  2291 + "tags": {
  2292 + "type": "array",
  2293 + "items": {
  2294 + "$ref": "#/definitions/ArticleTagItem"
  2295 + }
  2296 + }
  2297 + },
  2298 + "title": "ArticleTagGroup",
  2299 + "required": [
  2300 + "group",
  2301 + "tags"
  2302 + ]
  2303 + },
2313 "ArticleTagItem": { 2304 "ArticleTagItem": {
2314 "type": "object", 2305 "type": "object",
2315 "properties": { 2306 "properties": {
@@ -2322,13 +2313,17 @@ @@ -2322,13 +2313,17 @@
2322 }, 2313 },
2323 "name": { 2314 "name": {
2324 "type": "string" 2315 "type": "string"
  2316 + },
  2317 + "image": {
  2318 + "type": "string"
2325 } 2319 }
2326 }, 2320 },
2327 "title": "ArticleTagItem", 2321 "title": "ArticleTagItem",
2328 "required": [ 2322 "required": [
2329 "id", 2323 "id",
2330 "group", 2324 "group",
2331 - "name" 2325 + "name",
  2326 + "image"
2332 ] 2327 ]
2333 }, 2328 },
2334 "Auth": { 2329 "Auth": {
@@ -2355,8 +2350,6 @@ @@ -2355,8 +2350,6 @@
2355 "code" 2350 "code"
2356 ] 2351 ]
2357 }, 2352 },
2358 -<<<<<<< HEAD  
2359 -=======  
2360 "CommentAtWho": { 2353 "CommentAtWho": {
2361 "type": "object", 2354 "type": "object",
2362 "properties": { 2355 "properties": {
@@ -2366,6 +2359,9 @@ @@ -2366,6 +2359,9 @@
2366 }, 2359 },
2367 "name": { 2360 "name": {
2368 "type": "string" 2361 "type": "string"
  2362 + },
  2363 + "firstLetter": {
  2364 + "type": "string"
2369 } 2365 }
2370 }, 2366 },
2371 "title": "CommentAtWho", 2367 "title": "CommentAtWho",
@@ -2373,7 +2369,6 @@ @@ -2373,7 +2369,6 @@
2373 "id" 2369 "id"
2374 ] 2370 ]
2375 }, 2371 },
2376 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
2377 "CommentAuthor": { 2372 "CommentAuthor": {
2378 "type": "object", 2373 "type": "object",
2379 "properties": { 2374 "properties": {
@@ -2402,14 +2397,7 @@ @@ -2402,14 +2397,7 @@
2402 "title": "CommentAuthor", 2397 "title": "CommentAuthor",
2403 "required": [ 2398 "required": [
2404 "id", 2399 "id",
2405 -<<<<<<< HEAD  
2406 - "name",  
2407 - "avatar",  
2408 - "position",  
2409 - "company"  
2410 -=======  
2411 "name" 2400 "name"
2412 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
2413 ] 2401 ]
2414 }, 2402 },
2415 "Company": { 2403 "Company": {
@@ -2614,8 +2602,6 @@ @@ -2614,8 +2602,6 @@
2614 }, 2602 },
2615 "name": { 2603 "name": {
2616 "type": "string" 2604 "type": "string"
2617 -<<<<<<< HEAD  
2618 -=======  
2619 }, 2605 },
2620 "ids": { 2606 "ids": {
2621 "type": "array", 2607 "type": "array",
@@ -2624,18 +2610,13 @@ @@ -2624,18 +2610,13 @@
2624 "format": "int64" 2610 "format": "int64"
2625 }, 2611 },
2626 "description": " 用户ID" 2612 "description": " 用户ID"
2627 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
2628 } 2613 }
2629 }, 2614 },
2630 "title": "DepartmentUpdateRequest", 2615 "title": "DepartmentUpdateRequest",
2631 "required": [ 2616 "required": [
2632 "id", 2617 "id",
2633 -<<<<<<< HEAD  
2634 - "name"  
2635 -=======  
2636 "name", 2618 "name",
2637 "ids" 2619 "ids"
2638 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
2639 ] 2620 ]
2640 }, 2621 },
2641 "FollowRequest": { 2622 "FollowRequest": {
@@ -2893,23 +2874,9 @@ @@ -2893,23 +2874,9 @@
2893 "type": "integer", 2874 "type": "integer",
2894 "format": "int64", 2875 "format": "int64",
2895 "description": " 公司id" 2876 "description": " 公司id"
2896 - },  
2897 - "articleId": {  
2898 - "type": "integer",  
2899 - "format": "int64",  
2900 - "description": " 文章id"  
2901 - },  
2902 - "tagId": {  
2903 - "type": "integer",  
2904 - "format": "int64",  
2905 - "description": " 标签id"  
2906 } 2877 }
2907 }, 2878 },
2908 - "title": "MiniAllArticleTagRequest",  
2909 - "required": [  
2910 - "articleId",  
2911 - "tagId"  
2912 - ] 2879 + "title": "MiniAllArticleTagRequest"
2913 }, 2880 },
2914 "MiniAllArticleTagResponse": { 2881 "MiniAllArticleTagResponse": {
2915 "type": "object", 2882 "type": "object",
@@ -2917,20 +2884,13 @@ @@ -2917,20 +2884,13 @@
2917 "tagGroup": { 2884 "tagGroup": {
2918 "type": "array", 2885 "type": "array",
2919 "items": { 2886 "items": {
2920 - "type": "string"  
2921 - }  
2922 - },  
2923 - "tags": {  
2924 - "type": "array",  
2925 - "items": {  
2926 - "$ref": "#/definitions/ArticleTagItem" 2887 + "$ref": "#/definitions/ArticleTagGroup"
2927 } 2888 }
2928 } 2889 }
2929 }, 2890 },
2930 "title": "MiniAllArticleTagResponse", 2891 "title": "MiniAllArticleTagResponse",
2931 "required": [ 2892 "required": [
2932 - "tagGroup",  
2933 - "tags" 2893 + "tagGroup"
2934 ] 2894 ]
2935 }, 2895 },
2936 "MiniArticleBackupItem": { 2896 "MiniArticleBackupItem": {
@@ -3035,8 +2995,6 @@ @@ -3035,8 +2995,6 @@
3035 "type": "object", 2995 "type": "object",
3036 "title": "MiniArticleCommentAtUserResponse" 2996 "title": "MiniArticleCommentAtUserResponse"
3037 }, 2997 },
3038 -<<<<<<< HEAD  
3039 -=======  
3040 "MiniArticleCommentAtWhoRequest": { 2998 "MiniArticleCommentAtWhoRequest": {
3041 "type": "object", 2999 "type": "object",
3042 "properties": { 3000 "properties": {
@@ -3073,7 +3031,6 @@ @@ -3073,7 +3031,6 @@
3073 "list" 3031 "list"
3074 ] 3032 ]
3075 }, 3033 },
3076 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3077 "MiniArticleCreateRequest": { 3034 "MiniArticleCreateRequest": {
3078 "type": "object", 3035 "type": "object",
3079 "properties": { 3036 "properties": {
@@ -3632,11 +3589,7 @@ @@ -3632,11 +3589,7 @@
3632 "meLoveFlag": { 3589 "meLoveFlag": {
3633 "type": "integer", 3590 "type": "integer",
3634 "format": "int32", 3591 "format": "int32",
3635 -<<<<<<< HEAD  
3636 - "description": "当前人员对文章的点赞标识"  
3637 -=======  
3638 "description": " 当前人员对文章的点赞标识 (0 没有点赞 1有点赞)" 3592 "description": " 当前人员对文章的点赞标识 (0 没有点赞 1有点赞)"
3639 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3640 } 3593 }
3641 }, 3594 },
3642 "title": "MiniArticleGetResponse", 3595 "title": "MiniArticleGetResponse",
@@ -3822,8 +3775,6 @@ @@ -3822,8 +3775,6 @@
3822 "list" 3775 "list"
3823 ] 3776 ]
3824 }, 3777 },
3825 -<<<<<<< HEAD  
3826 -=======  
3827 "MiniArticleSetTagRequest": { 3778 "MiniArticleSetTagRequest": {
3828 "type": "object", 3779 "type": "object",
3829 "properties": { 3780 "properties": {
@@ -3867,7 +3818,6 @@ @@ -3867,7 +3818,6 @@
3867 "id" 3818 "id"
3868 ] 3819 ]
3869 }, 3820 },
3870 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3871 "MiniCreateArticleCommentRequest": { 3821 "MiniCreateArticleCommentRequest": {
3872 "type": "object", 3822 "type": "object",
3873 "properties": { 3823 "properties": {
@@ -3891,11 +3841,7 @@ @@ -3891,11 +3841,7 @@
3891 "format": "int64", 3841 "format": "int64",
3892 "description": " 服务端自动获取" 3842 "description": " 服务端自动获取"
3893 }, 3843 },
3894 -<<<<<<< HEAD  
3895 - "commnet": {  
3896 -=======  
3897 "pid": { 3844 "pid": {
3898 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3899 "type": "integer", 3845 "type": "integer",
3900 "format": "int64", 3846 "format": "int64",
3901 "description": " 回复那个评论的id" 3847 "description": " 回复那个评论的id"
@@ -3907,12 +3853,7 @@ @@ -3907,12 +3853,7 @@
3907 "atWho": { 3853 "atWho": {
3908 "type": "array", 3854 "type": "array",
3909 "items": { 3855 "items": {
3910 -<<<<<<< HEAD  
3911 - "type": "integer",  
3912 - "format": "int64"  
3913 -=======  
3914 "$ref": "#/definitions/CommentAtWho" 3856 "$ref": "#/definitions/CommentAtWho"
3915 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3916 }, 3857 },
3917 "description": " 填写评论时@的人" 3858 "description": " 填写评论时@的人"
3918 } 3859 }
@@ -3921,11 +3862,7 @@ @@ -3921,11 +3862,7 @@
3921 "required": [ 3862 "required": [
3922 "articleId", 3863 "articleId",
3923 "sectionId", 3864 "sectionId",
3924 -<<<<<<< HEAD  
3925 - "commnet",  
3926 -=======  
3927 "pid", 3865 "pid",
3928 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
3929 "content", 3866 "content",
3930 "atWho" 3867 "atWho"
3931 ] 3868 ]
@@ -3995,11 +3932,6 @@ @@ -3995,11 +3932,6 @@
3995 "atWho": { 3932 "atWho": {
3996 "type": "array", 3933 "type": "array",
3997 "items": { 3934 "items": {
3998 -<<<<<<< HEAD  
3999 - "$ref": "#/definitions/CommentAuthor"  
4000 - },  
4001 - "description": " 填写评论时@的人"  
4002 -=======  
4003 "$ref": "#/definitions/CommentAtWho" 3935 "$ref": "#/definitions/CommentAtWho"
4004 }, 3936 },
4005 "description": " 填写评论时@的人" 3937 "description": " 填写评论时@的人"
@@ -4007,7 +3939,6 @@ @@ -4007,7 +3939,6 @@
4007 "createdAt": { 3939 "createdAt": {
4008 "type": "integer", 3940 "type": "integer",
4009 "format": "int64" 3941 "format": "int64"
4010 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
4011 } 3942 }
4012 }, 3943 },
4013 "title": "MiniCreateArticleCommentResponse", 3944 "title": "MiniCreateArticleCommentResponse",
@@ -4025,9 +3956,6 @@ @@ -4025,9 +3956,6 @@
4025 "countReply", 3956 "countReply",
4026 "countUserLove", 3957 "countUserLove",
4027 "countAdminLove", 3958 "countAdminLove",
4028 -<<<<<<< HEAD  
4029 - "atWho"  
4030 -=======  
4031 "atWho", 3959 "atWho",
4032 "createdAt" 3960 "createdAt"
4033 ] 3961 ]
@@ -4149,7 +4077,6 @@ @@ -4149,7 +4077,6 @@
4149 "required": [ 4077 "required": [
4150 "total", 4078 "total",
4151 "list" 4079 "list"
4152 ->>>>>>> 77e95275539c30c5787295a0b7f7cd16a3263567  
4153 ] 4080 ]
4154 }, 4081 },
4155 "MiniMyLikeRequest": { 4082 "MiniMyLikeRequest": {
@@ -5320,7 +5247,7 @@ @@ -5320,7 +5247,7 @@
5320 "SystemArticleSearchRequest": { 5247 "SystemArticleSearchRequest": {
5321 "type": "object", 5248 "type": "object",
5322 "properties": { 5249 "properties": {
5323 - "": { 5250 + "companyId": {
5324 "type": "integer", 5251 "type": "integer",
5325 "format": "int64" 5252 "format": "int64"
5326 }, 5253 },
@@ -5349,9 +5276,6 @@ @@ -5349,9 +5276,6 @@
5349 }, 5276 },
5350 "title": "SystemArticleSearchRequest", 5277 "title": "SystemArticleSearchRequest",
5351 "required": [ 5278 "required": [
5352 - "title",  
5353 - "author",  
5354 - "publishDate",  
5355 "pageNumber", 5279 "pageNumber",
5356 "pageSize" 5280 "pageSize"
5357 ] 5281 ]
@@ -5383,7 +5307,7 @@ @@ -5383,7 +5307,7 @@
5383 "type": "integer", 5307 "type": "integer",
5384 "format": "int64" 5308 "format": "int64"
5385 }, 5309 },
5386 - "": { 5310 + "companyId": {
5387 "type": "integer", 5311 "type": "integer",
5388 "format": "int64" 5312 "format": "int64"
5389 }, 5313 },
@@ -5939,7 +5863,7 @@ @@ -5939,7 +5863,7 @@
5939 "TagCreateRequest": { 5863 "TagCreateRequest": {
5940 "type": "object", 5864 "type": "object",
5941 "properties": { 5865 "properties": {
5942 - "companyId": { 5866 + "": {
5943 "type": "integer", 5867 "type": "integer",
5944 "format": "int64" 5868 "format": "int64"
5945 }, 5869 },
@@ -5950,21 +5874,24 @@ @@ -5950,21 +5874,24 @@
5950 "type": "string", 5874 "type": "string",
5951 "description": " 标签名称" 5875 "description": " 标签名称"
5952 }, 5876 },
5953 - "group": { 5877 + "category": {
5954 "type": "string", 5878 "type": "string",
5955 "description": " 标签分类" 5879 "description": " 标签分类"
5956 }, 5880 },
5957 "remark": { 5881 "remark": {
5958 "type": "string", 5882 "type": "string",
5959 "description": " 备注" 5883 "description": " 备注"
  5884 + },
  5885 + "other": {
  5886 + "type": "string"
5960 } 5887 }
5961 }, 5888 },
5962 "title": "TagCreateRequest", 5889 "title": "TagCreateRequest",
5963 "required": [ 5890 "required": [
5964 - "companyId",  
5965 "image", 5891 "image",
5966 "name", 5892 "name",
5967 - "group" 5893 + "category",
  5894 + "other"
5968 ] 5895 ]
5969 }, 5896 },
5970 "TagCreateResponse": { 5897 "TagCreateResponse": {
@@ -5987,15 +5914,14 @@ @@ -5987,15 +5914,14 @@
5987 "type": "integer", 5914 "type": "integer",
5988 "format": "int64" 5915 "format": "int64"
5989 }, 5916 },
5990 - "companyId": { 5917 + "": {
5991 "type": "integer", 5918 "type": "integer",
5992 "format": "int64" 5919 "format": "int64"
5993 } 5920 }
5994 }, 5921 },
5995 "title": "TagDeleteRequest", 5922 "title": "TagDeleteRequest",
5996 "required": [ 5923 "required": [
5997 - "id",  
5998 - "-" 5924 + "id"
5999 ] 5925 ]
6000 }, 5926 },
6001 "TagDeleteResponse": { 5927 "TagDeleteResponse": {
@@ -6018,7 +5944,7 @@ @@ -6018,7 +5944,7 @@
6018 "type": "integer", 5944 "type": "integer",
6019 "format": "int64" 5945 "format": "int64"
6020 }, 5946 },
6021 - "companyId": { 5947 + "": {
6022 "type": "integer", 5948 "type": "integer",
6023 "format": "int64" 5949 "format": "int64"
6024 }, 5950 },
@@ -6029,22 +5955,25 @@ @@ -6029,22 +5955,25 @@
6029 "type": "string", 5955 "type": "string",
6030 "description": " 标签名称" 5956 "description": " 标签名称"
6031 }, 5957 },
6032 - "group": { 5958 + "category": {
6033 "type": "string", 5959 "type": "string",
6034 "description": " 标签分类" 5960 "description": " 标签分类"
6035 }, 5961 },
6036 "remark": { 5962 "remark": {
6037 "type": "string", 5963 "type": "string",
6038 "description": " 备注" 5964 "description": " 备注"
  5965 + },
  5966 + "other": {
  5967 + "type": "string"
6039 } 5968 }
6040 }, 5969 },
6041 "title": "TagEditRequest", 5970 "title": "TagEditRequest",
6042 "required": [ 5971 "required": [
6043 "id", 5972 "id",
6044 - "-",  
6045 "image", 5973 "image",
6046 "name", 5974 "name",
6047 - "group" 5975 + "category",
  5976 + "other"
6048 ] 5977 ]
6049 }, 5978 },
6050 "TagEditResponse": { 5979 "TagEditResponse": {
@@ -6067,15 +5996,14 @@ @@ -6067,15 +5996,14 @@
6067 "type": "integer", 5996 "type": "integer",
6068 "format": "int64" 5997 "format": "int64"
6069 }, 5998 },
6070 - "companyId": { 5999 + "": {
6071 "type": "integer", 6000 "type": "integer",
6072 "format": "int64" 6001 "format": "int64"
6073 } 6002 }
6074 }, 6003 },
6075 "title": "TagGetRequest", 6004 "title": "TagGetRequest",
6076 "required": [ 6005 "required": [
6077 - "id",  
6078 - "-" 6006 + "id"
6079 ] 6007 ]
6080 }, 6008 },
6081 "TagGetResponse": { 6009 "TagGetResponse": {
@@ -6092,13 +6020,16 @@ @@ -6092,13 +6020,16 @@
6092 "type": "string", 6020 "type": "string",
6093 "description": " 标签名称" 6021 "description": " 标签名称"
6094 }, 6022 },
6095 - "group": { 6023 + "category": {
6096 "type": "string", 6024 "type": "string",
6097 "description": " 标签分类" 6025 "description": " 标签分类"
6098 }, 6026 },
6099 "remark": { 6027 "remark": {
6100 "type": "string", 6028 "type": "string",
6101 "description": " 备注" 6029 "description": " 备注"
  6030 + },
  6031 + "other": {
  6032 + "type": "string"
6102 } 6033 }
6103 }, 6034 },
6104 "title": "TagGetResponse", 6035 "title": "TagGetResponse",
@@ -6106,8 +6037,9 @@ @@ -6106,8 +6037,9 @@
6106 "id", 6037 "id",
6107 "image", 6038 "image",
6108 "name", 6039 "name",
6109 - "group",  
6110 - "remark" 6040 + "category",
  6041 + "remark",
  6042 + "other"
6111 ] 6043 ]
6112 }, 6044 },
6113 "TagItem": { 6045 "TagItem": {
@@ -6124,7 +6056,7 @@ @@ -6124,7 +6056,7 @@
6124 "type": "string", 6056 "type": "string",
6125 "description": " 标签名称" 6057 "description": " 标签名称"
6126 }, 6058 },
6127 - "group": { 6059 + "category": {
6128 "type": "string", 6060 "type": "string",
6129 "description": " 标签分类" 6061 "description": " 标签分类"
6130 }, 6062 },
@@ -6142,7 +6074,7 @@ @@ -6142,7 +6074,7 @@
6142 "id", 6074 "id",
6143 "image", 6075 "image",
6144 "name", 6076 "name",
6145 - "group", 6077 + "category",
6146 "remark", 6078 "remark",
6147 "createdAt" 6079 "createdAt"
6148 ] 6080 ]
@@ -6158,14 +6090,14 @@ @@ -6158,14 +6090,14 @@
6158 "type": "integer", 6090 "type": "integer",
6159 "format": "int32" 6091 "format": "int32"
6160 }, 6092 },
6161 - "companyId": { 6093 + "": {
6162 "type": "integer", 6094 "type": "integer",
6163 "format": "int64" 6095 "format": "int64"
6164 }, 6096 },
6165 "tagName": { 6097 "tagName": {
6166 "type": "string" 6098 "type": "string"
6167 }, 6099 },
6168 - "group": { 6100 + "category": {
6169 "type": "string" 6101 "type": "string"
6170 }, 6102 },
6171 "remark": { 6103 "remark": {
@@ -6175,8 +6107,7 @@ @@ -6175,8 +6107,7 @@
6175 "title": "TagListRequest", 6107 "title": "TagListRequest",
6176 "required": [ 6108 "required": [
6177 "page", 6109 "page",
6178 - "size",  
6179 - "-" 6110 + "size"
6180 ] 6111 ]
6181 }, 6112 },
6182 "TagListResponse": { 6113 "TagListResponse": {
@@ -6456,6 +6387,10 @@ @@ -6456,6 +6387,10 @@
6456 "type": "string", 6387 "type": "string",
6457 "description": " 人员头像" 6388 "description": " 人员头像"
6458 }, 6389 },
  6390 + "position": {
  6391 + "type": "string",
  6392 + "description": " 职位"
  6393 + },
6459 "createdAt": { 6394 "createdAt": {
6460 "type": "integer", 6395 "type": "integer",
6461 "format": "int64", 6396 "format": "int64",
@@ -6468,6 +6403,7 @@ @@ -6468,6 +6403,7 @@
6468 "userId", 6403 "userId",
6469 "name", 6404 "name",
6470 "avatar", 6405 "avatar",
  6406 + "position",
6471 "createdAt" 6407 "createdAt"
6472 ] 6408 ]
6473 } 6409 }
@@ -363,10 +363,10 @@ type ( @@ -363,10 +363,10 @@ type (
363 //管理后台获取文章列表 363 //管理后台获取文章列表
364 type ( 364 type (
365 SystemArticleSearchRequest { 365 SystemArticleSearchRequest {
366 - CompanyId int64 `json:",optional"`  
367 - Title string `json:"title"` //标题  
368 - Author string `json:"author"` //发布人  
369 - PublishDate string `json:"publishDate"` //发布日期 366 + CompanyId int64 `json:"companyId,optional"`
  367 + Title string `json:"title,optional"` //标题
  368 + Author string `json:"author,optional"` //发布人
  369 + PublishDate string `json:"publishDate,optional"` //发布日期
370 PageNumber int `json:"pageNumber"` //页码 370 PageNumber int `json:"pageNumber"` //页码
371 PageSize int `json:"pageSize"` //每页行数 371 PageSize int `json:"pageSize"` //每页行数
372 } 372 }
@@ -390,7 +390,7 @@ type ( @@ -390,7 +390,7 @@ type (
390 //编辑 390 //编辑
391 SystemArticleUpdateRequest { 391 SystemArticleUpdateRequest {
392 Id int64 `json:"id"` 392 Id int64 `json:"id"`
393 - CompanyId int64 `json:",optional"` 393 + CompanyId int64 `json:"companyId,optional"`
394 Template int `json:"template"` // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式 394 Template int `json:"template"` // 使用哪个模板进行编辑 0、无 1、演绎式 2、归纳式
395 Section []ArticleSection `json:"section"` // 填写的内容 395 Section []ArticleSection `json:"section"` // 填写的内容
396 Title string `json:"title"` // 标题 396 Title string `json:"title"` // 标题
@@ -2,9 +2,11 @@ package article @@ -2,9 +2,11 @@ package article
2 2
3 import ( 3 import (
4 "context" 4 "context"
  5 + "github.com/jinzhu/now"
5 "github.com/samber/lo" 6 "github.com/samber/lo"
6 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain" 7 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
7 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr" 8 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
  9 + "time"
8 10
9 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc" 11 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
10 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types" 12 "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
@@ -28,15 +30,15 @@ func NewSystemSearchArticleLogic(ctx context.Context, svcCtx *svc.ServiceContext @@ -28,15 +30,15 @@ func NewSystemSearchArticleLogic(ctx context.Context, svcCtx *svc.ServiceContext
28 30
29 func (l *SystemSearchArticleLogic) SystemSearchArticle(req *types.SystemArticleSearchRequest) (resp *types.SystemArticleSearchResponse, err error) { 31 func (l *SystemSearchArticleLogic) SystemSearchArticle(req *types.SystemArticleSearchRequest) (resp *types.SystemArticleSearchResponse, err error) {
30 var conn = l.svcCtx.DefaultDBConn() 32 var conn = l.svcCtx.DefaultDBConn()
31 - total, articles, err := l.svcCtx.ArticleRepository.Find(  
32 - l.ctx,  
33 - conn,  
34 - req.CompanyId,  
35 - domain.NewQueryOptions().  
36 - WithOffsetLimit(req.PageNumber, req.PageSize).  
37 - WithKV("tile", req.Title).  
38 - WithKV("author", req.Author),  
39 - ) 33 + queryOptions := domain.NewQueryOptions().WithOffsetLimit(req.PageNumber, req.PageSize).WithKV("title", req.Title).WithKV("author", req.Author)
  34 + if req.PublishDate != "" {
  35 + publishTime, err := now.ParseInLocation(time.Local, req.PublishDate)
  36 + if err == nil {
  37 + queryOptions.WithKV("beginCreatedAt", now.With(publishTime).BeginningOfDay().Unix())
  38 + queryOptions.WithKV("endCreatedAt", now.With(publishTime).EndOfDay().Unix())
  39 + }
  40 + }
  41 + total, articles, err := l.svcCtx.ArticleRepository.Find(l.ctx, conn, req.CompanyId, queryOptions)
40 if err != nil { 42 if err != nil {
41 return nil, xerr.NewErrMsgErr("搜索帖子异常", err) 43 return nil, xerr.NewErrMsgErr("搜索帖子异常", err)
42 } 44 }
@@ -121,11 +121,13 @@ func (repository *ArticleRepository) Find(ctx context.Context, conn transaction. @@ -121,11 +121,13 @@ func (repository *ArticleRepository) Find(ctx context.Context, conn transaction.
121 queryFunc := func() (interface{}, error) { 121 queryFunc := func() (interface{}, error) {
122 tx = tx.Model(&ms).Order("id desc").Where("company_id=?", companyId) 122 tx = tx.Model(&ms).Order("id desc").Where("company_id=?", companyId)
123 if v, ok := queryOptions["ids"]; ok { 123 if v, ok := queryOptions["ids"]; ok {
124 - tx.Where("id in (?)", v) 124 + tx = tx.Where("id in (?)", v)
125 } 125 }
126 -  
127 - if v, ok := queryOptions["authorId"]; ok {  
128 - tx = tx.Where("author_id = ?", v) 126 + if v, ok := queryOptions["title"]; ok && v.(string) != "" {
  127 + tx = tx.Where("title like ?", "%"+v.(string)+"%")
  128 + }
  129 + if v, ok := queryOptions["author"]; ok {
  130 + tx = tx.Where(`author #>> '{"name"}' like ?`, "%"+v.(string)+"%")
129 } 131 }
130 if v, ok := queryOptions["beginCreatedAt"]; ok { 132 if v, ok := queryOptions["beginCreatedAt"]; ok {
131 tx = tx.Where("created_at >= ?", v) 133 tx = tx.Where("created_at >= ?", v)