bug修改

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/OrderPlateDO.java

@@ -123,7 +123,7 @@ public class OrderPlateDO extends BaseDO {
     private Long moduleTypeId;
 
     // 排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠
-    private Integer filterType;
+    private String filterType;
 
     // 备注
     private String remark;

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java

@@ -70,9 +70,9 @@ public class PlateServiceImpl implements PlateService {
         // 更新 判断是否有组织id
         if (updateReqVO.getOrganId() == null || updateReqVO.getOrganId() == 0){
             updateReqVO.setOrganId(OrganContextHolder.getOrganId());
-        }else {
-            validateOrganExists(updateReqVO.getOrganId());
         }
+        validateOrganExists(updateReqVO.getOrganId());
+
         // 校验存在
         validatePlateExists(updateReqVO.getId(), updateReqVO.getOrganId());
         PlateDO updateObj = BeanUtils.toBean(updateReqVO, PlateDO.class);
@@ -86,6 +86,8 @@ public class PlateServiceImpl implements PlateService {
         if (organId == null || organId == 0){
             organId = OrganContextHolder.getOrganId();
         }
+        validateOrganExists(organId);
+
         // 校验存在
         validatePlateExists(id,organId);
         // 删除
@@ -99,6 +101,7 @@ public class PlateServiceImpl implements PlateService {
     }
 
     @Override
+    @OrganIgnore
     public PlateDO getPlate(Long id) {
         return plateMapper.selectById(id);
     }