Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -36,7 +36,7 @@
 		left join cb_org_usr cou on c.belong_id =cou.sequence_nbr
 		where c.is_delete=FALSE
 		<if test="name != null and name != ''">
-			AND c.`name` like concat(#{name}, '%')
+			AND c.`name` like concat('%',#{name}, '%')
 		</if>
 		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}

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

@@ -279,4 +279,17 @@
 			ALTER TABLE `cb_firefighters` add native_place_value varchar(255) COMMENT '户籍所在地的值';
 		</sql>
 	</changeSet>
+	 <changeSet author="chenhao" id="2021-09-06-chenhao-1">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="cb_data_dictionary" />
+			<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+    	</preConditions>
+		<comment>insert data cb_data_dictionary</comment>
+		<sql>
+				INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1168', '1168', '环状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
+				INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1169', '1169', '环支状管网', 'XFJSGW', NULL, NULL, NULL, NULL, NULL, '\0', '1');
+				INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1170', '1170', '可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1');
+				INSERT INTO cb_data_dictionary (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1171', '1171', '不可用', 'SYZT', NULL, NULL, NULL, NULL, NULL, '\0', '1');
+		</sql> 
+	</changeSet>
 </databaseChangeLog>