From 2a845e1856ca8d625a48290c8f025d602ca1e385 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 10 Aug 2023 14:34:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=95=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/exam/api/ExamQuestionApi.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java index f19ab704..be826651 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java @@ -60,8 +60,13 @@ public class ExamQuestionApi extends ApiBaseController { @PostMapping("/page") public JsonResponse> page(Pagination pager, ExamQuestion examQuestion,String orderField,Boolean orderAsc) { - PageList list = service.query(pager.getPageIndex(), pager.getPageSize(), examQuestion,orderField,orderAsc); - return success(list); + try { + PageList list = service.query(pager.getPageIndex(), pager.getPageSize(), examQuestion,orderField,orderAsc); + return success(list); + }catch(Exception e) { + log.error("分页查询试题错误",e); + return error("查询试题错误",e.getMessage()); + } } /** From fa2ebc463dd5a1699f9f541a6dbbd2a844bf1274 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 15 Aug 2023 11:32:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=EF=BC=8C=20=E6=97=A0=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2hrbp=E7=9A=84=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IFwOrganizationService.java | 1 + .../system/service/IFwUserService.java | 1 + .../system/service/ILnTeacherService.java | 1 + .../system/service/IManagerRefService.java | 1 + .../module/course/api/CourseManageApi.java | 59 ++++++++++++------- 5 files changed, 43 insertions(+), 20 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwOrganizationService.java b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwOrganizationService.java index 2669958c..318c7cfd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwOrganizationService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwOrganizationService.java @@ -8,6 +8,7 @@ import com.xboe.system.organization.entity.Organization; /** * 调用旧系统的外部接口 */ +@Deprecated public interface IFwOrganizationService { /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwUserService.java b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwUserService.java index 2e847400..e463dc48 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwUserService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IFwUserService.java @@ -7,6 +7,7 @@ import java.util.List; /** * 调用旧系统的外部接口 */ +@Deprecated public interface IFwUserService { /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/ILnTeacherService.java b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/ILnTeacherService.java index 301a1d7e..2377c187 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/ILnTeacherService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/ILnTeacherService.java @@ -8,6 +8,7 @@ import com.xboe.module.teacher.vo.TeacherVo; /** * 调用旧系统的外部接口 */ +@Deprecated public interface ILnTeacherService { /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IManagerRefService.java b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IManagerRefService.java index ea5d7a11..defebdfa 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IManagerRefService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/externalinterface/system/service/IManagerRefService.java @@ -2,6 +2,7 @@ package com.xboe.externalinterface.system.service; import java.util.List; +@Deprecated public interface IManagerRefService { List getCompanyIdsByUserId(String uid); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 8b011630..9e7d9098 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; @@ -19,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.xboe.account.entity.Account; import com.xboe.common.PageList; import com.xboe.common.Pagination; import com.xboe.core.CurrentUser; @@ -28,7 +28,7 @@ import com.xboe.core.api.ApiBaseController; import com.xboe.core.log.AutoLog; import com.xboe.data.dto.UserOrgIds; import com.xboe.data.outside.IOutSideDataService; -import com.xboe.externalinterface.system.service.IFwUserService; +import com.xboe.data.service.IDataUserSyncService; import com.xboe.module.assistance.service.IEmailService; import com.xboe.module.course.dto.CourseExportDto; import com.xboe.module.course.dto.CourseFullDto; @@ -51,11 +51,9 @@ import com.xboe.module.course.service.ICourseTeacherService; import com.xboe.module.excel.ExportsExcelSenderUtil; import com.xboe.standard.enums.BoedxContentType; import com.xboe.standard.enums.BoedxCourseType; -import com.xboe.system.organization.entity.Organization; import com.xboe.system.organization.service.IOrganizationService; import com.xboe.system.user.entity.User; import com.xboe.system.user.service.IUserService; -import com.xboe.system.user.vo.UserVo; import lombok.extern.slf4j.Slf4j; @@ -73,8 +71,9 @@ public class CourseManageApi extends ApiBaseController{ @Resource private ICourseService courseService; - @Autowired - IFwUserService fwUserService; + @Autowired + IOutSideDataService outsideService; + @Resource IEmailService service; @@ -103,6 +102,9 @@ public class CourseManageApi extends ApiBaseController{ @Resource IOutSideDataService outSideDataService; + @Autowired + IDataUserSyncService userSyncService; + /** * 管理列表的查询 * @param pager @@ -480,16 +482,18 @@ public class CourseManageApi extends ApiBaseController{ } if(!isLocalDevelopment()) { if(StringUtils.isBlank(dto.getAuditUser().getAid())) { - if(StringUtils.isBlank(dto.getAuditUser().getKid())) { - return badRequest("HRBP审核信息人员错误"); - } +// if(StringUtils.isBlank(dto.getAuditUser().getKid())) { +// return badRequest("HRBP审核信息人员错误"); +// } //转化用户id User u = userService.getByUserNo(dto.getAuditUser().getCode()); - if(u==null) { //本地没有，需要同步 + if(u==null) { //本地没有，需要同步、 + //20230815 直接返回错误，这个时候传的用户，在新系统中没有，需要用户登录一下，或着用户中心推送 + return badRequest("无关联HRBP审核人员，请先同步用户"); //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); - UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid()); - Account a =userService.syncAccountUser(fwUser); - dto.getAuditUser().setAid(a.getId()); +// UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid()); +// Account a =userService.syncAccountUser(fwUser); +// dto.getAuditUser().setAid(a.getId()); }else { dto.getAuditUser().setAid(u.getId()); } @@ -566,7 +570,7 @@ public class CourseManageApi extends ApiBaseController{ } @PostMapping("/sumbits") - public JsonResponse sumbitId(CourseHRBPAudit audit,String ucode,String ukid,String email,String orgName){ + public JsonResponse sumbitId(HttpServletRequest request,CourseHRBPAudit audit,String ucode,String ukid,String email,String orgName){ if(StringUtils.isBlank(audit.getCourseId())){ return badRequest("参数错误"); } @@ -596,16 +600,31 @@ public class CourseManageApi extends ApiBaseController{ if(!isLocalDevelopment()) { if(StringUtils.isBlank(audit.getAid())) { - if(StringUtils.isBlank(ukid)){ - return badRequest("未关联HRBP审核人员"); - } + +// if(StringUtils.isBlank(ukid)){ +// return badRequest("未关联HRBP审核人员"); +// } //转化用户id User u = userService.getByUserNo(ucode); if(u==null) { //本地没有，需要同步 + return badRequest("无关联HRBP审核人员，请先同步用户"); //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); - UserVo fwUser = fwUserService.getById(ukid); - Account a =userService.syncAccountUser(fwUser); - audit.setAid(a.getId()); + //20230815 已经不再使用直接查老系统，采用接口同步的方式 +// UserVo fwUser = fwUserService.getById(ukid); +// Account a =userService.syncAccountUser(fwUser); +// audit.setAid(a.getId()); +// String token = TokenProxy.getBoeToken(request); +// UserData udata=outsideService.getUserInfoByToken(token); +// if(udata==null) { +// log.error("未获取当前登录人的用户信息"); +// return wrap(JsonResponseStatus.TOKEN_NOPASS, "用户信息查询失败"); +// } +// //检查本地是否存在，如果存在就更新，不存在就添加 +// try { +// userSyncService.syncUserFull(udata); +// }catch(Exception exp) { +// log.error("登录同步用户错误",exp); +// } }else { audit.setAid(u.getId()); } From 713eedd184b5fc5012740dd67553124da782858e Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 15 Aug 2023 16:02:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=A0=B9=E6=8D=AE=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=91=98=E5=B7=A5=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/teacher/service/impl/TeacherServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java index 907174ad..bed566ec 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java @@ -101,10 +101,10 @@ public class TeacherServiceImpl implements ITeacherService { @Override public List findByName(String name) { String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u "; - hql+=" where t.id=u.id and t.name like '%"+name+"%'"; + hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)"; List teachers=new ArrayList(); try { - List list =dao.findListFields(hql); + List list =dao.findListFields(hql,name); for(Object[] objs :list) { Teacher t=new Teacher(); t.setId((String)objs[0]);