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

src/main/java/com/sooka/sponest/data/emergency/appmin/enterprise/controller/AppEnterpriseController.java

@@ -31,10 +31,10 @@ public class AppEnterpriseController extends BaseController {
     }
 
     @RequestMapping("getInitEnterpriseList")
-    public TableDataInfo getInitEnterpriseList(AppEnterpriseVO vo) {
+    public AjaxResult getInitEnterpriseList(AppEnterpriseVO vo) {
         startPage();
         List list = appEnterpriseService.getEnterpriseList(vo);
-        return getDataTable(list);
+        return AjaxResult.success(getDataTable(list));
     }
 
     @RequestMapping("getEnterpriseDetails")

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
@@ -289,7 +290,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
             //
             Map map = new HashMap();
             map.put("nickName", user.getSysUser().getNickName());
-            map.put("deptName", user.getSysUser().getDept().getDeptName());
+            map.put("deptName", user.getSysUser().getDepts().get(0).getDeptName());
             map.put("latTime", day);
             map.put("riskInspections", list);
             return AjaxResult.success(map);

src/main/resources/mapper/emergency/appmin/AppEnterpriseMapper.xml

@@ -36,7 +36,7 @@
     </select>
 
     <select id="getEnterpriseList" parameterMap="pm_AppEnterpriseVO" resultMap="rm_AppEnterpriseListBO">
-        select e.bus_enterprise_id as busEnterpriseId,e.business_name as businessName,longitude,latitude,e.del_flag delFlag,
+        select e.bus_enterprise_id as busEnterpriseId,e.business_name as businessName,longitude,latitude,
         (select count(*) from t_bus_log g
           where g.bus_enterprise_id=e.bus_enterprise_id and
            (g.risk_status = 'risk_status_0' or g.risk_status = 'risk_status_1')) riskCount

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

@@ -23,11 +23,11 @@
 
     <select id="selectTBusInspectionList" parameterType="TBusInspection" resultMap="TBusInspectionResult">
         select i.bus_inspection_id,i.bus_log_id, i.bus_items_id, i.items_type,
-        (select dict_label from sys_dict_data where dict_value=i.items_type) itemsTypeValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value=i.items_type) itemsTypeValue,
         i.time_limit, i.lat_time,
         i.is_pass,
         i.bus_items_name, i.risk_status,
-        (select dict_label from sys_dict_data where dict_value=i.risk_status) riskStatusValue,
+        (select dict_label from onest_system.sys_dict_data where dict_value=i.risk_status) riskStatusValue,
         i.create_time
         from t_bus_inspection i,t_bus_dept d
         <where>