电站建设管理-施工管理-派工发料管理、完工登记管理、完工自审管理权限修改。

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +15,9 @@ import java.util.List;
  * @date 2024-01-02
  */
 public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+    @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrder> selectWorkOrderList(@Param("dto") WorkOrder dto);
+    @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -14,7 +14,9 @@
 
        ) peasantHouseholdSgNum
 
-       FROM  hygf_work_order WHERE hygf_work_order.is_delete=0
+       FROM  hygf_work_order
+       LEFT JOIN hygf_peasant_household  ON hygf_peasant_household.developer_code  = hygf_work_order.amos_dealer_org_code
+       WHERE hygf_work_order.is_delete=0
 
        <if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
            and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionRecords;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -123,13 +124,14 @@ public class WorkOrderController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping   (value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询",  notes = "施工派工工单分页查询")
+    @UserLimits
 	public ResponseModel<Page<WorkOrder>> queryForPage(@RequestBody WorkOrder  workOrder
     ) {
 
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-
-        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+//
+//        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 
         return ResponseHelper.buildResponse(workOrderServiceImpl.selectPage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
 	}
@@ -167,15 +169,16 @@ public class WorkOrderController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/wgpage")
     @ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询",  notes = "施工派工工单分页查询")
+    @UserLimits
     public ResponseModel<Page<WorkOrderPage>> queryForwgpage(
                                                          @RequestBody WorkOrderPage  workOrder
     ) {
 
 	     //当前登录人所属场站
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-
-        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
-        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+//
+//        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
+//        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 
         return ResponseHelper.buildResponse(workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
     }