浏览代码

条件变更

yue 5 年之前
父节点
当前提交
665eea4e1c

+ 2 - 2
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -347,13 +347,13 @@ public class MyImportUtils {
                 tips += "必要性问题说明不能为空;";
             }
         }
-        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"一致".equals(disclose.getLineName())&&!"不一致".equals(disclose.getLineName()))) {
+        if ("".equals(disclose.getLineName()) || disclose.getLineName() == null||(!"是".equals(disclose.getLineName())&&!"否".equals(disclose.getLineName()))) {
             tips += "线路名称、设备、开关、杆号一致性填写有误;";
         }
         if ("".equals(disclose.getQuantities()) || disclose.getQuantities() == null||(!"是".equals(disclose.getQuantities())&&!"否".equals(disclose.getQuantities()))) {
             tips += "工程量是否一致填写有误;";
         }
-        if ("不一致".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())||"不一致".equals(disclose.getRodNumber())) {
+        if ("".equals(disclose.getLineName())||"否".equals(disclose.getQuantities())) {
             if ("".equals(disclose.getInconsistentDescription()) || disclose.getInconsistentDescription() == null) {
                 tips += "图纸现场不一致说明不能为空;";
             }