1
0

2 Коммитууд 9dcd823b6e ... e81298adc9

Эзэн SHA1 Мессеж Огноо
  guoyujia e81298adc9 Merge remote-tracking branch 'origin/master' 13 цаг өмнө
  guoyujia f2ab4936e0 0619 13 цаг өмнө

+ 2 - 1
src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -473,7 +473,8 @@ public class BizDayworkItemController extends BaseController {
 
     @PostMapping("/getInnerTurnoverByDeptId")
     @Log(title = "查询工段内部周转", businessType = BusinessType.SELECT)
-    public AjaxResult getInnerTurnoverByDeptId(@RequestBody BizDayworkItem bizDayworkItem) {
+    public AjaxResult getInnerTurnoverByDeptId(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizDayworkItem);
         List<BizDaywork> dayworkList = bizDayworkItemService.getInnerListByDeptId(bizDayworkItem);
         if (!dayworkList.isEmpty()) {
             List<Long> dayworkIds = dayworkList.stream().map(BizDaywork::getId).collect(Collectors.toList());

+ 1 - 0
src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -519,6 +519,7 @@
                 and biz_daywork_carrier.carrier_code like concat('%',#{keywords},'%')
                 ) )
             </if>
+            <if test="tenantId != null and tenantId != 0">AND t1.tenant_id = #{tenantId}</if>
         </trim>
     </select>
     <select id="getItemScreen" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">