Browse Source

修改禅道缺陷

hanfucheng 1 year ago
parent
commit
6be1226502

+ 3 - 0
data-ui/src/views/data/digitalagriculture/along/index.vue

@@ -257,6 +257,9 @@
           soyaBladeNum: [
             {validator: checkPositiveDecimal, trigger: 'blur'}
           ],
+          time: [
+            {required: true, message: "时间不能为空", trigger: "change"}
+          ],
         }
       };
     },

+ 3 - 3
data-ui/src/views/data/digitalagriculture/schedule/index.vue

@@ -292,9 +292,9 @@ export default {
         deptId: [
           {required: true, message: "所属部门不能为空", trigger: "change"}
         ],
-        // time: [
-        //   {required: true, message: "时间不能为空", trigger: "change"}
-        // ],
+        time: [
+          {required: true, message: "时间不能为空", trigger: "change"}
+        ],
         cornReapArea: [
           // {required: true, message: "玉米收获面积不能为空", trigger: "blur"},
           {validator: checkPositiveDecimal, trigger: 'blur'}

+ 3 - 0
data-ui/src/views/data/digitalagriculture/seedingProgress/index.vue

@@ -284,6 +284,9 @@
             // {required: true, message: "占计划育秧或插秧面积的百分比不能为空", trigger: "blur"},
             {validator: checkPositiveDecimal, trigger: 'blur'}
           ],
+          time: [
+            {required: true, message: "时间不能为空", trigger: "change"}
+          ],
         }
       };
     },

+ 1 - 1
src/main/resources/mapper/other/CenterdataSink.xml

@@ -41,7 +41,7 @@
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="idCode != null  and idCode != ''">and identifiedcode like concat('%', #{idCode}, '%')</if>
             <if test="phone != null  and phone != ''">and phone like concat('%',#{phone},'%')</if>
-            <if test="userType != null  and userType != ''">and user_type = #{userType}</if>
+            <if test="userType != null  and userType != ''">and a.user_type = #{userType}</if>
         </where>
     </select>