From 260503ea98af016a38de82d4186745c72ac79f86 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 26 Feb 2025 14:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/worker/controller/WorkerTypeController.java     | 6 +++++-
 .../modules/worker/service/impl/WorkerInfoServiceImpl.java  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerTypeController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerTypeController.java
index edc678c45..caf75f621 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerTypeController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerTypeController.java
@@ -1,5 +1,6 @@
 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.extension.plugins.pagination.Page;
 import com.zhgd.annotation.OperLog;
@@ -51,8 +52,11 @@ public class WorkerTypeController {
     })
     @PostMapping(value = "/page")
     public Result<Page<WorkerType>> queryPageList(@RequestBody Map<String, Object> map) {
+        String typeName = MapUtils.getString(map, "typeName");
         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));
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 4f477d35c..7a9bd4571 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -2178,11 +2178,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                     dtId = Convert.toLong(o1.get("id"));
                 }
             } else {
-                Map o1 = (Map) departmentMap.get(name + "-" + typeName);
+                Map o1 = (Map) departmentMap.get(typeName);
                 if (o1 == null) {
                     DepartmentInfo info = new DepartmentInfo();
                     info.setEnterpriseId(enterpriseId);
-                    info.setDepartmentName(typeName);
+                    info.setDepartmentName(StringUtils.substringAfter(typeName, name + "-"));
                     info.setProjectSn(projectSn);
                     departmentInfoService.save(info);
                     dtId = info.getId();