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

src/main/java/com/sooka/sponest/data/emergency/appmin/warehouse/controller/AppWarehouseController.java

@@ -26,7 +26,7 @@ public class AppWarehouseController extends BaseController {
             List list =appWarehouseService.getWarehouseList(vo);
             list.removeAll(Collections.singleton(null));
             TableDataInfo tableDataInfo = getDataTable(list);
-            return AjaxResult.success(tableDataInfo);
+            return AjaxResult.success(tableDataInfo.getRows());
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询失败");

src/main/java/com/sooka/sponest/data/emergency/appmin/xungeng/controller/AppXungengController.java

@@ -31,7 +31,7 @@ public class AppXungengController extends BaseController {
             List list  = appXungengService.getXungengInfo(vo);
             list.removeAll(Collections.singleton(null));
             TableDataInfo tableDataInfo = getDataTable(list);
-            return AjaxResult.success(tableDataInfo);
+            return AjaxResult.success(tableDataInfo.getRows());
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询失败");

src/main/java/com/sooka/sponest/data/emergency/appmin/xungeng/service/impl/AppXungengServiceImpl.java

@@ -97,6 +97,7 @@ public class AppXungengServiceImpl extends BaseServiceImpl implements AppXungeng
         try{
             TBusLog tBusLog = new TBusLog();
             tBusLog.setBusPatrolstationId(vo.getBusPatrolstationId());
+            setSookaDataBase(tBusLog);
             List list = logMapper.selectTBusLogList(tBusLog);
             return  list;
         }catch (Exception e){

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -69,7 +69,7 @@ public class AppXunjianController {
     }
 
     @RequestMapping("deleteXunjianItem")
-    public AjaxResult deleteXunjianItem(AppXunjianVO vo) {
+    public AjaxResult deleteXunjianItem(@RequestBody AppXunjianVO vo) {
         return appXunjianService.deleteXunjianItem(vo);
     }
 

src/main/resources/mapper/emergency/system/TBusLogMapper.xml

@@ -77,14 +77,14 @@
     <select id="selectTBusLogList" parameterType="TBusLog" resultMap="TBusLogResult">
         select g.bus_log_id,
         g.bus_log_type,
-        (select dict_label from sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
         log_source,
-        (select dict_label from sys_dict_data where dict_value=g.log_source) log_source_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.log_source) log_source_value,
         g.is_risk,
         (case g.is_risk when 1 then '有' else '无' end) is_risk_value,
         g.bus_enterprise_id, g.bus_enterprise_name,
         g.risk_status,
-        (select dict_label from sys_dict_data where dict_value=g.risk_status) risk_status_value,
+        (select dict_label from ${database_system}.sys_dict_data where dict_value=g.risk_status) risk_status_value,
         g.longitude, g.latitude,g.create_time,g.bus_patrolstation_id,g.bus_patrolstation_name,
         date_format(g.create_time,'%Y-%m-%d %H:%m:%s') create_time_str from t_bus_log g,t_bus_dept d
         <where>