bug 18026 18017

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -513,6 +513,8 @@
                     #{item}
                 </foreach>
             </if>
+            and es.iot_code is not null
+            and es.iot_code != ''
         </where>
     </select>
 

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3870,5 +3870,17 @@
         </sql>
     </changeSet>
 
+    <changeSet author="ltw" id="20230614-ltw-01">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_organization_user" columnName="post_name"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_organization_user modify columns</comment>
+        <sql>
+            ALTER TABLE `cb_organization_user`  MODIFY `post_name` varchar(4000) DEFAULT NULL COMMENT '岗位名称'
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>