|
|
@@ -116,7 +116,8 @@ public class BizInspectionStandardsController extends BaseController
|
|
|
public void saveCheck(String code, BizInspectionStandards bizInspectionStandards){
|
|
|
if (bizInspectionStandards.getId() !=null){
|
|
|
//这里的删除是为了不同权限操作时只保留一个
|
|
|
- List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId()).list();
|
|
|
+ List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId())
|
|
|
+ .eq("tenant_id",bizInspectionStandards.getTenantId()).list();
|
|
|
List<Long>ids = new ArrayList<>();
|
|
|
for(BizInspectionStandardsCheck item:standardsId){
|
|
|
ids.add(item.getId());
|
|
|
@@ -126,6 +127,7 @@ public class BizInspectionStandardsController extends BaseController
|
|
|
List<BizCheckCategory> list = bizCheckCategoryService.query().eq("code", code).list();
|
|
|
BizInspectionStandardsCheck item = new BizInspectionStandardsCheck();
|
|
|
item.setStandardsId(bizInspectionStandards.getId());
|
|
|
+ item.setTenantId(bizInspectionStandards.getTenantId());
|
|
|
item.setProcessCode(bizInspectionStandards.getProcessCode());
|
|
|
item.setProductId(bizInspectionStandards.getProductId());
|
|
|
item.setProductVersion(bizInspectionStandards.getProductVersion());
|
|
|
@@ -138,7 +140,8 @@ public class BizInspectionStandardsController extends BaseController
|
|
|
bizInspectionStandardsCheckService.save(item);
|
|
|
}
|
|
|
public void removeCheck(String code , BizInspectionStandards bizInspectionStandards){
|
|
|
- List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId()).list();
|
|
|
+ List<BizInspectionStandardsCheck> standardsId = bizInspectionStandardsCheckService.query().eq("inspection_code", code).eq("standards_id", bizInspectionStandards.getId())
|
|
|
+ .eq("tenant_id",bizInspectionStandards.getTenantId()).list();
|
|
|
if (!standardsId.isEmpty()){
|
|
|
List<Long>ids = new ArrayList<>();
|
|
|
for(BizInspectionStandardsCheck item:standardsId){
|
