From e9eeaffa11afac4bbfcf0d3682eecb52236812b4 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 8 Jan 2026 16:59:34 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E6=9C=BA=E5=85=B7=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E6=9D=83=E9=99=90=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/impl/ComplexQueryServiceImpl.java   |  9 +++++++++
 .../material/ma/service/impl/PartTypeServiceImpl.java | 11 +++++++++++
 .../mapper/material/basic/ComplexQueryMapper.xml      |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
index 5462d6de..d63050d6 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java
@@ -10,6 +10,7 @@ import com.bonus.material.basic.domain.vo.MaTypeSelectInfo;
 import com.bonus.material.basic.mapper.ComplexQueryMapper;
 import com.bonus.material.basic.service.ComplexQueryService;
 import com.bonus.material.ma.domain.Type;
+import com.bonus.material.ma.service.ITypeService;
 import com.bonus.material.part.domain.PartInventory;
 import com.bonus.material.part.domain.PartTypeQueryDto;
 import com.bonus.material.push.domain.MachineInfoBean;
@@ -36,6 +37,9 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
     @Resource
     private ComplexQueryMapper complexQueryMapper;
 
+    @Resource
+    private ITypeService iTypeService;
+
     /**
      * 工程机具使用列表
      *
@@ -720,6 +724,11 @@ public class ComplexQueryServiceImpl implements ComplexQueryService {
     public List<RetainedEquipmentInfo> getPartPersonNum(RetainedEquipmentInfo bean) {
         Long userId = SecurityUtils.getLoginUser().getUserid();
         bean.setUserId(userId);
+        /**
+         * jsk
+         */
+        Long companyId=iTypeService.getUserDeptId();
+        bean.setCompanyId(companyId.intValue());
         return complexQueryMapper.getPartPersonNum(bean);
     }
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java
index 655c46b6..5618735a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/PartTypeServiceImpl.java
@@ -12,6 +12,7 @@ import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.material.ma.domain.TypeKeeper;
+import com.bonus.material.ma.service.ITypeService;
 import com.bonus.material.part.domain.PartLeaseDetails;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -21,6 +22,8 @@ import com.bonus.material.ma.mapper.PartTypeMapper;
 import com.bonus.material.ma.domain.PartType;
 import com.bonus.material.ma.service.IPartTypeService;
 
+import javax.annotation.Resource;
+
 /**
  * 配件类型管理Service业务层处理
  * 
@@ -34,6 +37,9 @@ public class PartTypeServiceImpl implements IPartTypeService
     @Autowired
     private PartTypeMapper partTypeMapper;
 
+    @Resource
+    private ITypeService iTypeService;
+
     /**
      * 查询配件类型管理
      * 
@@ -148,6 +154,11 @@ public class PartTypeServiceImpl implements IPartTypeService
         partType.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
         partType.setParentId(partType.getId() != 0 ? partType.getId() : 0L);
         partType.setLevel(partType.getLevel() != null ? String.valueOf(Integer.valueOf(partType.getLevel()) + 1) : "1");
+        /**
+         * jsk
+         */
+        Long companyId=iTypeService.getUserDeptId();
+        partType.setCompanyId(companyId+"");
         int result = partTypeMapper.insertPartType(partType);
         if (result > 0) {
             return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index 646e4c53..2ec3bf2d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
@@ -1705,6 +1705,9 @@
             JOIN ma_part_type_keeper mtk ON mtk.type_id = mt.pa_id AND mtk.user_id = #{userId}
         </if>
         WHERE mt.del_flag = '0' and mt.`level` = '3'
+        <if test="companyId != null and companyId != ''">
+            and mt.company_id=#{companyId}
+        </if>
         <if test="keyWord != null and keyWord != ''">
             and (
             mt2.pa_name like concat('%',#{keyWord},'%') or