938 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiaozhequ	54df004ce5	Revert "解决查询不出例外人" ... This reverts commit 2cc74026bf. # Conflicts: # modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java	2023-10-20 09:14:50 +08:00
xiaozhequ	a918f612c5	解决查询不出例外人	2023-10-19 23:15:15 +08:00
xiaozhequ	acccac4d6e	增加判断条件	2023-10-19 16:05:12 +08:00
xiaozhequ	9d056889b3	修改查询条件	2023-10-19 14:55:36 +08:00
xiaozhequ	596f7a3e25	加入例外人员为空的判断	2023-10-18 19:32:51 +08:00
xiaozhequ	367b0d05ea	10/18 添加工号配置 受众权限	2023-10-18 11:39:28 +08:00
xiaozhequ	a4c67fc52e	10/17	2023-10-17 20:44:10 +08:00
joshen	0bfc7dd661	Merge branch 'up_master' into 'master' ... Up master See merge request !15	2023-09-01 17:53:26 +08:00
joshen	ccca881ee9	Merge branch 'cloud' into 'up_master' ... Cloud See merge request !14	2023-09-01 17:49:08 +08:00
BOE\10867418	2374fa7d5a	Merge branch 'cloud' into old-cloud	2023-09-01 17:11:03 +08:00
daihh	94468c07cf	去掉课程查询的调试打印日志	2023-09-01 15:33:28 +08:00
daihh	17b8498642	修正获取权限组织id集合读取时未去掉引号的问题	2023-09-01 15:24:51 +08:00
daihh	170a42e72c	增加测试	2023-09-01 14:48:08 +08:00
daihh	44221e65c0	加打印日志	2023-09-01 10:45:29 +08:00
daihh	43961699cb	修改打印日志	2023-09-01 09:40:45 +08:00
daihh	45fb80a8e3	修改打印的日志	2023-09-01 09:18:53 +08:00
daihh	bae236fc3e	课程资源归属查询匹配规则当前只MainList数组匹配。修改为 Main List和Readonly List 两个数组的合集。	2023-09-01 09:05:16 +08:00
449427055	0b210472d9	Merge branch 'fix_yjc_0821' into 'master' ... 修改配置文件 See merge request !13	2023-08-21 17:28:11 +08:00
yujicun	955d80444f	修改配置文件	2023-08-21 17:27:17 +08:00
449427055	b2f8d7f255	Merge branch 'fix_yjc_0821' into 'master' ... Fix yjc 0821 See merge request !12	2023-08-21 17:10:41 +08:00
yujicun	50163aa0dc	修改日志	2023-08-21 17:07:07 +08:00
yujicun	5ded38c0fd	添加日志	2023-08-21 16:58:16 +08:00
BOE\10867418	1c864de6eb	Merge branch 'cloud'	2023-08-15 16:33:13 +08:00
daihh	fda67f26bf	ids人员调用时，空的问题处理	2023-08-15 16:30:49 +08:00
BOE\10867418	e2082b7d94	Merge branch 'dev0731'	2023-08-15 16:09:28 +08:00
BOE\10867418	30f774e4c3	Merge branch 'cloud' into dev0731	2023-08-15 16:08:00 +08:00
daihh	713eedd184	教师查询除了根据名称，同时增加员工号查询	2023-08-15 16:02:13 +08:00
yujicun	7579ae4e3d	Merge remote-tracking branch 'boe/dev0731' into dev0731	2023-08-15 13:26:55 +08:00
yujicun	f823f2191f	Merge remote-tracking branch 'origin/cloud' into dev0731	2023-08-15 13:26:04 +08:00
daihh	fa2ebc463d	课程审核， 无人员信息时，查询hrbp的相关调整	2023-08-15 11:32:33 +08:00
daihh	2a845e1856	查询试题，增加一个日志	2023-08-10 14:34:38 +08:00
joshen	39ac8303db	Merge branch 'dev0731' into 'master' ... Dev0731 See merge request !11	2023-08-09 20:07:50 +08:00
lims1@hunktimes.com	c37819d6b0	课程受众权限调整	2023-08-09 19:31:10 +08:00
lims1@hunktimes.com	50c5353139	课程受众权限日志	2023-08-09 19:23:50 +08:00
lims1@hunktimes.com	d410d7bb7e	课程受众权限日志	2023-08-09 19:18:52 +08:00
lims1@hunktimes.com	c24991eaa4	课程受众权限	2023-08-09 18:56:21 +08:00
lims1@hunktimes.com	91784a0a95	课程受众权限	2023-08-09 16:47:45 +08:00
449427055	ea0a30b3dd	Update application-pro.properties	2023-08-08 22:14:00 +08:00
joshen	ee91e68c88	Merge branch 'dev0731' into 'master' ... Dev0731 See merge request !10	2023-08-08 18:57:07 +08:00
lims1@hunktimes.com	09caa2546f	日志级别	2023-08-08 18:37:24 +08:00
lims1@hunktimes.com	befeaaefea	课程-无权限也可搜索	2023-08-08 11:50:21 +08:00
lims1@hunktimes.com	23a02a1355	Merge remote-tracking branch 'origin/dev0731' into dev0731	2023-08-08 11:41:41 +08:00
lims1@hunktimes.com	eeeb17a4ce	课程-无权限也可搜索	2023-08-08 11:41:06 +08:00
yujicun	76d80bcf1c	Merge remote-tracking branch 'boe/dev0731' into dev0731	2023-08-08 11:18:54 +08:00
yujicun	d716aaf9b0	合并解决冲突	2023-08-08 11:18:20 +08:00
yujicun	2cf6362004	Merge remote-tracking branch 'boe/cloud' into cloud	2023-08-08 11:15:24 +08:00
lims1@hunktimes.com	b42284b511	课程受众-例外 boe_study_course 取值	2023-08-08 10:19:39 +08:00
lims1@hunktimes.com	ee67b600d3	课程受众-例外	2023-08-07 21:42:45 +08:00
lims1@hunktimes.com	3951d245fb	课程受众-例外	2023-08-07 16:58:24 +08:00
lims1@hunktimes.com	5d7b751e63	使用token获取受众	2023-08-07 15:31:30 +08:00