diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java index 4ce2d799..be22d5b5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull; 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.purchase.domain.dto.PurchaseNoticePersonDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,6 +42,9 @@ public class PurchaseNoticePersonController extends BaseController { @Resource private IPurchaseNoticePersonService purchaseNoticePersonService; + @Resource + private ITypeService typeService; + /** * 查询新购短信通知人员列表 */ @@ -48,6 +52,8 @@ public class PurchaseNoticePersonController extends BaseController { //@RequiresPermissions("purchase:person:notice") @GetMapping("/list") public TableDataInfo list(PurchaseNoticePerson purchaseNoticePerson) { + Long deptId = typeService.getUserDeptId(); + purchaseNoticePerson.setCompanyId(deptId); List list = purchaseNoticePersonService.selectPurchaseNoticePersonList(purchaseNoticePerson); return getDataTable(list); } @@ -59,6 +65,8 @@ public class PurchaseNoticePersonController extends BaseController { //@RequiresPermissions("purchase:person:notice") @GetMapping("/listUnSelected") public TableDataInfo listUnSelected(PurchaseNoticePerson purchaseNoticePerson) { + Long deptId = typeService.getUserDeptId(); + purchaseNoticePerson.setCompanyId(deptId); List list = purchaseNoticePersonService.getUnSelectedUserList(purchaseNoticePerson); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java index 06294b7b..4802e5e4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java @@ -55,4 +55,5 @@ public class PurchaseNoticePerson extends BaseEntity { @ApiModelProperty("任务id") private String taskId; + private Long companyId; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml index 8f9cf2c4..f0757b3e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseNoticePersonMapper.xml @@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept d2 ON d1.parent_id = d2.dept_id WHERE u.STATUS = '0' + + AND (d.dept_id = #{companyId} OR d1.dept_id = #{companyId} OR d2.dept_id = #{companyId}) + AND pnp.user_name like concat('%', #{userName}, '%') @@ -72,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.nick_name like concat('%', #{userName}, '%') + + AND (d.dept_id = #{companyId} OR d1.dept_id = #{companyId} OR d2.dept_id = #{companyId}) + GROUP BY u.user_id