|
@@ -58,7 +58,7 @@ public class JobUserController {
|
|
|
|
|
|
@ResponseBody
|
|
|
@GetMapping("/getDataByID")
|
|
|
- public BaseResponse<PcJobuser> getDataById(String id,String loginUserID) {
|
|
|
+ public BaseResponse<PcJobuser> getDataById(String id, String loginUserID) {
|
|
|
var data = jobuserService.getDataById(id);
|
|
|
if (data == null) {
|
|
|
data = new JobUserVo();
|
|
@@ -67,12 +67,12 @@ public class JobUserController {
|
|
|
siteUserExp.or().andUserIDEqualTo(loginUserID);
|
|
|
//siteUserExp.or().andUserIDEqualTo(accountService.getLoginUserID());
|
|
|
var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
|
|
|
- if(curSiteUserInfo != null){
|
|
|
+ if (curSiteUserInfo != null) {
|
|
|
data.setSiteID(curSiteUserInfo.getSiteID());
|
|
|
PcSiteExample siteExp = new PcSiteExample();
|
|
|
siteExp.or().andSiteIDEqualTo(curSiteUserInfo.getSiteID());
|
|
|
var curSiteInfo = pcSiteMapper.selectByExample(siteExp).stream().findFirst().orElse(null);
|
|
|
- if(curSiteInfo != null){
|
|
|
+ if (curSiteInfo != null) {
|
|
|
data.setRegionCode(curSiteInfo.getRegionCode());
|
|
|
}
|
|
|
}
|
|
@@ -118,7 +118,14 @@ public class JobUserController {
|
|
|
@ResponseBody
|
|
|
@PostMapping("/baseInfoSave")
|
|
|
public BaseResponse baseInfoSave(@RequestBody JobUserVo data) {
|
|
|
- var result = jobuserService.baseInfoSave(data, accountService.getLoginUserID());
|
|
|
+ String loginUserID = data.loginUserID;
|
|
|
+ try {
|
|
|
+ loginUserID = accountService.getLoginUserID();
|
|
|
+ }
|
|
|
+ catch (Exception e){
|
|
|
+ }
|
|
|
+
|
|
|
+ var result = jobuserService.baseInfoSave(data, loginUserID);
|
|
|
return RespGenerstor.success(result);
|
|
|
}
|
|
|
|
|
@@ -138,13 +145,13 @@ public class JobUserController {
|
|
|
@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize,
|
|
|
@RequestParam(required = false) List<String> jobUserIDList,
|
|
|
@RequestParam(required = false) String name, @RequestParam(required = false) String siteId, @RequestParam(required = false) String jobStatus,
|
|
|
- @RequestParam(required = false) Integer sexId,@RequestParam(required = false) Integer educationTypeId,
|
|
|
+ @RequestParam(required = false) Integer sexId, @RequestParam(required = false) Integer educationTypeId,
|
|
|
@RequestParam(required = false) Integer emphasisTypeId) throws Exception {
|
|
|
PageInfo<JobUserVo> result = jobuserService.getList(pageIndex, pageSize, jobUserIDList, name, siteId, jobStatus, sexId, educationTypeId, emphasisTypeId, null, null);
|
|
|
|
|
|
- if(isExport == null || !isExport){
|
|
|
+ if (isExport == null || !isExport) {
|
|
|
return RespGenerstor.success(result);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
ExcelHelper excelHelper = new ExcelHelper();
|
|
|
ExcelHelper.ExcelData data = excelHelper.new ExcelData();
|
|
|
data.setTitles(Arrays.asList(new String[]{"序号", "姓名", "公民身份号码", "性别", "民族", "联系电话", "所属驿站", "年龄", "文化程度", "地址", "就业状态", "重点人员类别"}));
|