diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java index 3372672..78a67d3 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java @@ -17,6 +17,7 @@ import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -27,6 +28,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; + /** * 分包商合同信息列表 * @author 马三炮 @@ -48,6 +51,11 @@ public class BmSubContractController extends BaseController { @SysLog(title = "分包商合同信息", businessType = OperaType.QUERY, logType = 0, module = "分包商合同信息->项目部列表") public TableDataInfo list(BmSubContract bmSubContract) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + BeanUtils.populate(bmSubContract, map); + } startPage(); List list = bmSubContractService.selectSubContractList(bmSubContract); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmSubContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmSubContract.java index afb025b..edfaddc 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmSubContract.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmSubContract.java @@ -18,6 +18,21 @@ public class BmSubContract { */ private Integer id; + /** + * 总公司 + */ + private Integer comId; + + /** + * 分公司 + */ + private Integer subComId; + + /** + * 项目部id + */ + private Integer orgId; + /** * 分包合同编码 */ diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml index d390612..b008823 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml @@ -56,6 +56,15 @@ and pp.pro_name LIKE CONCAT('%', #{proName}, '%') + + and pp.com_id =#{comId} + + + and pp.sub_com_id =#{subComId} + + + and pp.org_id =#{orgId} + and bsc.sub_ein_status =#{subEinStatus}