From fb3938a1a3c4ab13d639bd59f49e4669f0a72c75 Mon Sep 17 00:00:00 2001 From: itcast Date: Fri, 9 Jan 2026 10:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmAssetAttributesController.java | 12 ++++++++++++ .../basic/controller/BmProjectController.java | 10 ++++++++++ .../material/basic/controller/BmUnitController.java | 8 ++++++++ .../basic/controller/BmUnitPersonController.java | 6 ++++++ .../material/basic/domain/BmAssetAttributes.java | 4 ++++ .../bonus/material/basic/domain/BmUnitPerson.java | 2 ++ .../basic/service/impl/BmUnitPersonServiceImpl.java | 5 +++++ .../controller/ScrapApplyDetailsController.java | 9 +++++++++ .../service/impl/ScrapApplyDetailsServiceImpl.java | 8 +++++++- .../controller/UseMaintenanceWarningController.java | 8 ++++++++ .../domain/UseMaintenanceWarningBean.java | 3 +++ .../material/basic/BmAssetAttributesMapper.xml | 5 +++++ .../mapper/material/basic/BmProjectMapper.xml | 6 +++++- .../resources/mapper/material/basic/BmUnitMapper.xml | 3 +++ .../mapper/material/basic/BmUnitPersonMapper.xml | 4 ++++ .../material/scrap/ScrapApplyDetailsMapper.xml | 1 + .../warningAnalysis/UseMaintenanceWarningMapper.xml | 3 +++ 17 files changed, 95 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java index bf88f034..50f85886 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java @@ -10,6 +10,7 @@ import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.basic.domain.BmAssetAttributes; import com.bonus.material.basic.service.BmAssetAttributesService; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.ma.service.ITypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -35,6 +36,9 @@ public class BmAssetAttributesController extends BaseController { @Resource private BmAssetAttributesService bmAssetAttributesService; + @Resource + private ITypeService typeService; + /** * 分页查询 * @@ -49,6 +53,10 @@ public class BmAssetAttributesController extends BaseController { if (bmAssetAttributes.getIsAll() != null) { return AjaxResult.success(bmAssetAttributesService.queryByPage(bmAssetAttributes)); } + + Long deptId = typeService.getUserDeptId(); + bmAssetAttributes.setCompanyId(deptId); + startPage(); List list = bmAssetAttributesService.queryByPage(bmAssetAttributes); return AjaxResult.success(getDataTable(list)); @@ -79,6 +87,8 @@ public class BmAssetAttributesController extends BaseController { @SysLog(title = "资产属性管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增资产属性管理") @PostMapping public AjaxResult add(@Validated @RequestBody BmAssetAttributes bmAssetAttributes) { + Long deptId = typeService.getUserDeptId(); + bmAssetAttributes.setCompanyId(deptId); return bmAssetAttributesService.insert(bmAssetAttributes); } @@ -122,6 +132,8 @@ public class BmAssetAttributesController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, BmAssetAttributes bmAssetAttributes) { + Long deptId = typeService.getUserDeptId(); + bmAssetAttributes.setCompanyId(deptId); List list = bmAssetAttributesService.queryByPage(bmAssetAttributes); ExcelUtil util = new ExcelUtil(BmAssetAttributes.class); util.exportExcel(response, list, "资产属性管理数据"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java index 6fd3c645..b731babc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.common.utils.HttpClient; +import com.bonus.material.ma.service.ITypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +45,9 @@ public class BmProjectController extends BaseController @Autowired private IBmProjectService bmProjectService; + @Autowired + private ITypeService typeService; + /** * 查询标段工程管理列表 */ @@ -52,6 +56,8 @@ public class BmProjectController extends BaseController @GetMapping("/list") public TableDataInfo list(BmProject bmProject) { + Long deptId = typeService.getUserDeptId(); + bmProject.setCompanyId(deptId); startPage(); List list = bmProjectService.selectBmProjectList(bmProject); return getDataTable(list); @@ -67,6 +73,8 @@ public class BmProjectController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, BmProject bmProject) { + Long deptId = typeService.getUserDeptId(); + bmProject.setCompanyId(deptId); List list = bmProjectService.selectBmProjectList(bmProject); ExcelUtil util = new ExcelUtil(BmProject.class); util.exportExcel(response, list, "标段工程管理数据"); @@ -93,6 +101,8 @@ public class BmProjectController extends BaseController @PostMapping public AjaxResult add(@Validated @RequestBody BmProject bmProject) { + Long deptId = typeService.getUserDeptId(); + bmProject.setCompanyId(deptId); return bmProjectService.insertBmProject(bmProject); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java index 49c98222..65e18f98 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.ma.service.ITypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,9 @@ public class BmUnitController extends BaseController @Autowired private IBmUnitService bmUnitService; + @Autowired + private ITypeService typeService; + /** * 查询往来单位管理列表 */ @@ -63,6 +67,8 @@ public class BmUnitController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, BmUnit bmUnit) { + Long deptId = typeService.getUserDeptId(); + bmUnit.setCompanyId(deptId); List list = bmUnitService.selectBmUnitList(bmUnit); ExcelUtil util = new ExcelUtil(BmUnit.class); util.exportExcel(response, list, "往来单位管理数据"); @@ -89,6 +95,8 @@ public class BmUnitController extends BaseController @PostMapping public AjaxResult add(@Validated @RequestBody BmUnit bmUnit) { + Long deptId = typeService.getUserDeptId(); + bmUnit.setCompanyId(deptId); return bmUnitService.insertBmUnit(bmUnit); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java index 81dedf55..e072528b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java @@ -34,6 +34,9 @@ public class BmUnitPersonController extends BaseController @Autowired private IBmUnitPersonService bmUnitPersonService; + @Autowired + private ITypeService typeService; + /** * 查询往来单位绑定管理列表 @@ -43,6 +46,9 @@ public class BmUnitPersonController extends BaseController @GetMapping("/list") public TableDataInfo list(BmUnitPerson bmUnitPerson) { + + Long deptId = typeService.getUserDeptId(); + bmUnitPerson.setCompanyIdL(deptId); startPage(); List list = bmUnitPersonService.selectBmUnitList(bmUnitPerson); return getDataTable(list); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAssetAttributes.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAssetAttributes.java index a879c614..da623eaa 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAssetAttributes.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAssetAttributes.java @@ -49,5 +49,9 @@ public class BmAssetAttributes extends BaseEntity implements Serializable { */ private Integer isAll; + /** + * 公司id + */ + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java index 618ed227..12a52c5f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java @@ -38,6 +38,8 @@ public class BmUnitPerson extends BaseEntity @ApiModelProperty(value = "数据所属组织") private String companyId; + private Long companyIdL; + /** 单位类型名称 */ @ApiModelProperty(value = "单位类型名称") private String unitName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java index 062399fa..ff5a362e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java @@ -9,6 +9,7 @@ import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmUnit; import com.bonus.material.basic.mapper.BmUnitMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.system.api.RemoteDeptService; import com.bonus.system.api.domain.SysDept; @@ -45,6 +46,9 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService @Resource private RemoteDeptService remoteDeptService; + @Resource + private ITypeService typeService; + /** * 新增往来单位管理 * @@ -92,6 +96,7 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService @Override public List selectBmUnitList(BmUnitPerson bmUnitPerson) { Long paramId = bmUnitPerson.getUserId(); + List bmUnitList = bmUnitPersonMapper.selectBmUnitList(bmUnitPerson); Long[] array = bmUnitList.stream() // 提取 createBy 字段 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java index 9b54ffff..d3bd3601 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java @@ -9,11 +9,13 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo; import com.bonus.material.scrap.domain.vo.ScrapTaskListVo; import com.bonus.material.scrap.domain.vo.ScrapTotalListVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -45,6 +47,9 @@ public class ScrapApplyDetailsController extends BaseController { @Autowired private IScrapApplyDetailsService scrapApplyDetailsService; + @Autowired + private ITypeService typeService; + /** * 查询报废任务详细列表 */ @@ -69,6 +74,8 @@ public class ScrapApplyDetailsController extends BaseController { // @RequiresPermissions("scrap:details:list") @GetMapping("/inventoryList") public AjaxResult inventoryList(ScrapApplyDetails scrapApplyDetails) { + Long deptId = typeService.getUserDeptId(); + scrapApplyDetails.setCompanyId(deptId); Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); List list = scrapApplyDetailsService.selectInventoryList(scrapApplyDetails); @@ -109,6 +116,8 @@ public class ScrapApplyDetailsController extends BaseController { @ApiOperation(value = "新增盘点报废") @PostMapping("/addList") public AjaxResult savePutInfo(@RequestBody ScrapApplyDetails scrapApplyDetails) { + Long deptId = typeService.getUserDeptId(); + scrapApplyDetails.setCompanyId(deptId); return scrapApplyDetailsService.savePutInfo(scrapApplyDetails); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java index 651344f1..248f3036 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java @@ -20,6 +20,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MachineVo; import com.bonus.material.ma.mapper.MachineMapper; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.scrap.domain.MaCodeInfo; import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo; import com.bonus.material.scrap.domain.vo.ScrapTaskListVo; @@ -61,6 +62,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Resource private MachineMapper machineMapper; + @Resource + private ITypeService typeService; + /** * 查询报废任务详细 * @@ -674,8 +678,10 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { int thisMonthMaxOrder = taskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_PART_SCRAP.getTaskTypeId()); // 生成盘点报废单号 String code = genderBfTaskCode(thisMonthMaxOrder); + + Long deptId = typeService.getUserDeptId(); TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PART_SCRAP.getTaskTypeId(), RepairInputStatusEnum.INPUT_TASK_NO_FINISHED.getStatus(), - null,thisMonthMaxOrder + 1, code); + deptId,thisMonthMaxOrder + 1, code); tmTask.setCreateTime(DateUtils.getNowDate()); tmTask.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); // 插入任务 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java index 87763957..9319023c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java @@ -6,6 +6,7 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.ma.service.ITypeService; import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean; import com.bonus.material.warningAnalysis.service.UseMaintenanceWarningService; import io.swagger.annotations.Api; @@ -29,6 +30,9 @@ public class UseMaintenanceWarningController extends BaseController @Autowired private UseMaintenanceWarningService service; + @Autowired + private ITypeService typeService; + /** * 查询工程在用检修预警 */ @@ -50,6 +54,8 @@ public class UseMaintenanceWarningController extends BaseController @GetMapping("/getOverTimeList") public TableDataInfo getOverTimeList(UseMaintenanceWarningBean bean) { + Long deptId = typeService.getUserDeptId(); + bean.setCompanyId(deptId); startPage(); List list = service.getOverTimeListList(bean); return getDataTable(list); @@ -66,6 +72,8 @@ public class UseMaintenanceWarningController extends BaseController @PostMapping("/exportOverTimeList") public void exportOverTimeList(HttpServletResponse response, UseMaintenanceWarningBean bean) { + Long deptId = typeService.getUserDeptId(); + bean.setCompanyId(deptId); List list = service.getOverTimeListList(bean); ExcelUtil util = new ExcelUtil(UseMaintenanceWarningBean.class); util.exportExcel(response, list, "安全工器具检修过期列表"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java index 92061c2f..f0278416 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java @@ -147,4 +147,7 @@ public class UseMaintenanceWarningBean extends BaseEntity { @ApiModelProperty(value = "状态筛选") private Integer status; + + @ApiModelProperty(value = "数据所属组织") + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAssetAttributesMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAssetAttributesMapper.xml index eeba2e86..514eba63 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAssetAttributesMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAssetAttributesMapper.xml @@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" asset_name, create_by, create_time, + company_id, del_flag @@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{assetName}, #{createBy}, #{createTime}, + #{companyId}, 0 @@ -64,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bma.create_time as createTime, bma.del_flag as delFlag, bma.update_by as updateBy, bma.update_time as updateTime from bm_asset_attributes bma where bma.del_flag = '0' + + and bma.company_id =#{companyId} + and bma.asset_name like concat('%', #{assetName}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml index f4c543b0..6cb296c4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml @@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.pro_status, bp.contract_part, bp.pro_center, - bp.is_slt as isSlt + bp.is_slt as isSlt, + bp.company_id from bm_project bp @@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bp.del_flag = 0 + and company_id =#{companyId} and pro_name like concat('%', #{proName}, '%') and external_id = #{externalId} and external_info = #{externalInfo} @@ -136,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" contract_part, pro_center, is_slt + company_id #{proId}, @@ -164,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{contractPart}, #{proCenter}, #{isSlt} + #{companyId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml index b3af0647..a2b01003 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml @@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by as updateBy, update_time as updateTime, remark as remark from bm_unit where del_flag = 0 + and company_id=#{companyId} and unit_name like concat('%', #{unitName}, '%') @@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + company_id, #{unitName}, @@ -105,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{companyId}, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml index e34482d0..b09c8234 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml @@ -49,8 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bup.user_id = #{userId} + WHERE bu.del_flag = 0 + + AND bu.company_id=#{companyIdL} + and bu.unit_name like concat('%', #{unitName}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml index 10ca4d01..cdecee29 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml @@ -452,6 +452,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN tm_task tt on sad.task_id = tt.task_id AND tt.task_type = 15 where sad.scrap_source = '3' + and tt.company_id =#{companyId} and tt.task_status = #{taskStatus} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml index 55150a15..a300a0c3 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml @@ -249,6 +249,9 @@ AND mm.next_check_time is not null AND mt.jiju_type = 2 AND mt2.type_id not in (6032,6008,6270) + + AND sd.dept_id=#{companyId} + /*AND DATEDIFF(mm.next_check_time, CURDATE()) <= 30*/ AND mm.next_check_time >= NOW()