admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-02-26 14:14:23 +08:00
parent 8b3243745f
commit 260503ea98
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerTypeController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.worker.controller; package com.zhgd.xmgl.modules.worker.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
@ -51,8 +52,11 @@ public class WorkerTypeController {
}) })
@PostMapping(value = "/page") @PostMapping(value = "/page")
public Result<Page<WorkerType>> queryPageList(@RequestBody Map<String, Object> map) { public Result<Page<WorkerType>> queryPageList(@RequestBody Map<String, Object> map) {
String typeName = MapUtils.getString(map, "typeName");
QueryWrapper<WorkerType> queryWrapper = new QueryWrapper<>(); QueryWrapper<WorkerType> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(WorkerType::getProjectSn, MapUtils.getString(map, "projectSn")); queryWrapper.lambda()
.eq(WorkerType::getProjectSn, MapUtils.getString(map, "projectSn"))
.like(StrUtil.isNotBlank(typeName), WorkerType::getTypeName, typeName);
return Result.success(workerTypeService.page(PageUtil.getPage(map), queryWrapper)); return Result.success(workerTypeService.page(PageUtil.getPage(map), queryWrapper));
} }

4
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -2178,11 +2178,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
dtId = Convert.toLong(o1.get("id")); dtId = Convert.toLong(o1.get("id"));
} }
} else { } else {
Map o1 = (Map) departmentMap.get(name + "-" + typeName); Map o1 = (Map) departmentMap.get(typeName);
if (o1 == null) { if (o1 == null) {
DepartmentInfo info = new DepartmentInfo(); DepartmentInfo info = new DepartmentInfo();
info.setEnterpriseId(enterpriseId); info.setEnterpriseId(enterpriseId);
info.setDepartmentName(typeName); info.setDepartmentName(StringUtils.substringAfter(typeName, name + "-"));
info.setProjectSn(projectSn); info.setProjectSn(projectSn);
departmentInfoService.save(info); departmentInfoService.save(info);
dtId = info.getId(); dtId = info.getId();