浏览代码

Merge branch 'dailyReport' into test

zhangcl 1 周之前
父节点
当前提交
3cc10abc19

+ 2 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -64,7 +64,8 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
         if (ObjUtil.isEmpty(createReqVO.getDeptId())) {
             throw exception(IOT_RH_DAILY_REPORT_NO_DEPT);
         }
-        if ("1".equals(createReqVO.getProjectClassification()) && ObjUtil.isEmpty(createReqVO.getCurrentDepth())) {
+        if ((StrUtil.isBlank(createReqVO.getProjectClassification())||"1".equals(createReqVO.getProjectClassification()))
+                && ObjUtil.isEmpty(createReqVO.getCurrentDepth())) {
             // 钻井类型日报必须 填写当前井深
             throw exception(IOT_RY_DAILY_REPORT_CURRENT_DEPTH_NOT_EXISTS);
         }