Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request LiuChao/foton-slrs-system-rest!525
2022-06-17 10:51:03 +08:00
parent dca0dfc929 4f3d93cbe9
commit 7e10443c64
2 changed files with 3 additions and 17 deletions
@@ -227,7 +227,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
            sarStandMenuEO.setId(UUIDUtils.randomUUID20());
            sarBussStandMenuEODao.insertSelective(sarStandMenuEO);
        }
-        int insertresult = sarBussionessStandEODao.insertSelective(sarBussionessStandEO);
+        int insertresult = this.baseMapper.insert(sarBussionessStandEO);
        if (insertresult >= 1) {
            // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
            updateReplaceConnect(sarBussionessStandEO);
@@ -86,24 +86,10 @@ fulltextserch/fulltextserch/_mapping?pretty&include_type_name=true
 				"fielddata": true
 			},
 			"standSortOrder": {
-				"type": "text",
-				"fields": {
-					"keyword": {
-						"type": "keyword",
-						"ignore_above": 256
-					}
-				},
-				"fielddata": true
+				"type": "integer"
 			},
 			"standTypeOrder": {
-				"type": "text",
-				"fields": {
-					"keyword": {
-						"type": "keyword",
-						"ignore_above": 256
-					}
-				},
-				"fielddata": true
+				"type": "integer"
 			},
 			"textContent": {
 				"type": "text",