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

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/domain/AppPatrolstationVO.java

@@ -1,10 +1,11 @@
 package com.sooka.sponest.data.emergency.appmin.patrolstation.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 @Data
-public class AppPatrolstationVO extends BaseEntity {
+public class AppPatrolstationVO extends BaseBusinessEntity {
 
     String searchValue;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/patrolstation/service/impl/AppPatrolstationServiceImpl.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.appmin.patrolstation.service.impl;
 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.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.domain.AppPatrolstationVO;
 import com.sooka.sponest.data.emergency.appmin.patrolstation.service.AppPatrolstationService;
@@ -16,7 +17,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppPatrolstationServiceImpl extends AppBaseService implements AppPatrolstationService {
+public class AppPatrolstationServiceImpl extends BaseServiceImpl implements AppPatrolstationService {
 
     @Resource
     TBusPatrolstationMapper tBusPatrolstationMapper;
@@ -26,6 +27,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
 
     @Override
     public AjaxResult addPatrolstation(AppPatrolstationVO vo) {
+        setSookaDataBase(vo);
         try {
             TBusPatrolstation t = new TBusPatrolstation();
             t.setBusPatrolstationCode(vo.getBusPatrolstationCode());
@@ -43,7 +45,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
             tBusPatrolstation.setLongitude(vo.getLongitude());
             tBusPatrolstation.setRemarks(vo.getRemarks());
 
-            TBusEnterprise  enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+            TBusEnterprise  enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
             tBusPatrolstation.setBusEnterpriseName(enterprise.getBusinessName());
 
             tBusPatrolstationMapper.insertTBusPatrolstation(tBusPatrolstation);
@@ -72,6 +74,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
 
     @Override
     public AjaxResult edittPatrolstationList(AppPatrolstationVO vo) {
+        setSookaDataBase(vo);
         try {
             TBusPatrolstation tBusPatrolstation = new TBusPatrolstation();
             tBusPatrolstation.setBusPatrolstationId(vo.getBusPatrolstationId());
@@ -81,7 +84,7 @@ public class AppPatrolstationServiceImpl extends AppBaseService implements AppPa
             tBusPatrolstation.setLatitude(vo.getLatitude());
             tBusPatrolstation.setBusPatrolstationCode(vo.getBusPatrolstationCode());
             if(vo.getBusEnterpriseId() != null){
-                TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+                TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
                 tBusPatrolstation.setBusEnterpriseName(enterprise.getBusinessName());
             }
             tBusPatrolstation.setBusEnterpriseId(vo.getBusEnterpriseId());

src/main/java/com/sooka/sponest/data/emergency/appmin/team/controller/AppTeamController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.team.domain.AppTeamVO;
 import com.sooka.sponest.data.emergency.appmin.team.service.AppTeamService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,14 +20,11 @@ public class AppTeamController extends BaseController {
     @Resource
     AppTeamService appTeamService;
 
-    @RequestMapping("getTeamList")
+    @GetMapping("getTeamList")
     public AjaxResult getTeamList(AppTeamVO vo){
         try{
-            startPage();
             List list =  appTeamService.getTeamList(vo);
-            list.removeAll(Collections.singleton(null));
-            TableDataInfo tableDataInfo = getDataTable(list);
-            return AjaxResult.success(tableDataInfo);
+            return AjaxResult.success(list);
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询错误");

src/main/java/com/sooka/sponest/data/emergency/appmin/team/service/impl/AppTeamServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sooka.sponest.data.emergency.appmin.team.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.team.domain.AppTeamVO;
 import com.sooka.sponest.data.emergency.appmin.team.service.AppTeamService;
@@ -12,15 +14,16 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class AppTeamServiceImpl extends AppBaseService implements AppTeamService {
+public class AppTeamServiceImpl extends BaseServiceImpl implements AppTeamService {
 
     @Resource
     TBusTeamMapper tBusTeamMapper;
 
     @Override
-    @DataScope(deptAlias = "t")
+    @DataScopeMutiDept(deptAlias = "d")
     public List getTeamList(AppTeamVO vo) {
         TBusTeam tBusTeam = new TBusTeam();
+        setSookaDataBase(tBusTeam);
         tBusTeam.setTeamName(vo.getTeamName());
         tBusTeam.setParams(vo.getParams());
         return tBusTeamMapper.selectTBusTeamList(tBusTeam);

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.xungeng.domain.AppXungengVO;
 import com.sooka.sponest.data.emergency.appmin.xungeng.service.AppXungengService;
@@ -19,7 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class AppXungengServiceImpl extends AppBaseService implements AppXungengService {
+public class AppXungengServiceImpl extends BaseServiceImpl implements AppXungengService {
 
     @Resource
     TBusLogMapper logMapper;
@@ -53,7 +54,8 @@ public class AppXungengServiceImpl extends AppBaseService implements AppXungengS
             tBusLog.setBusPatrolstationName(tBusPatrolstation.getBusPatrolstationName());
             tBusLog.setBusEnterpriseId(tBusPatrolstation.getBusEnterpriseId());
 
-            tBusLog.setBusEnterpriseName(tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusPatrolstation.getBusEnterpriseId()).getBusinessName());
+            setSookaDataBase(tBusPatrolstation);
+            tBusLog.setBusEnterpriseName(tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusPatrolstation).getBusinessName());
             tBusLog.setBusPatrolstationName(tBusPatrolstation.getBusEnterpriseName());
             tBusLog.setCreateTime(new Date());
             logMapper.insertTBusLog(tBusLog);

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

@@ -58,12 +58,12 @@ public class AppXunjianController {
     }
 
     @RequestMapping("getItemsLast")
-    public AjaxResult getItemsLast(AppXunjianVO vo) {
+    public AjaxResult getItemsLast(@RequestBody AppXunjianVO vo) {
         return appXunjianService.getItemsLast(vo);
     }
 
 
-    @RequestMapping("saveXunjianItems")
+    @PostMapping("saveXunjianItems")
     public AjaxResult saveXunjianItems(@RequestBody AppXunjianVO vo) {
         return appXunjianService.saveXunjianItems(vo);
     }
@@ -89,7 +89,7 @@ public class AppXunjianController {
         return appXunjianService.getFCTZSdetail(vo);
     }
 
-    @RequestMapping("changeInspection")
+    @PostMapping("changeInspection")
     public AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo) {
         return appXunjianService.changeInspection(vo);
     }

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/domain/AppXunjianVO.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.appmin.xunjian.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +9,7 @@ import java.util.Map;
 
 @Getter
 @Setter
-public class AppXunjianVO extends BaseEntity {
+public class AppXunjianVO extends BaseBusinessEntity {
 
     String busEnterpriseId;
 

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

@@ -9,7 +9,10 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
+import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.appmin.util.ImageUtil;
 import com.sooka.sponest.data.emergency.appmin.xunjian.domain.*;
 import com.sooka.sponest.data.emergency.appmin.xunjian.mapper.AppXunjianMapper;
@@ -26,7 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
-public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianService {
+public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjianService {
     @Resource
     AppXunjianMapper appXunjianMapper;
     @Resource
@@ -125,6 +128,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
 
     @Override
     public AjaxResult submitXunjian(AppXunjianVO vo) {
+        setSookaDataBase(vo);
         Map result = new HashMap();
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
@@ -236,7 +240,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
                 }
             }
             tBusLog.setBusEnterpriseId(vo.getBusEnterpriseId());
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getBusEnterpriseId());
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo);
             tBusLog.setBusEnterpriseName(enterprise.getBusinessName());
             tBusLog.setLatitude(vo.getLatitude());
             tBusLog.setLongitude(vo.getLongitude());
@@ -320,7 +324,7 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
             ajaxResult.put("items_first", list);
 
 
-            return ajaxResult;
+            return AjaxResult.success(ajaxResult);
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("错误");
@@ -413,9 +417,11 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
     @Override
     public AjaxResult saveZGTZS(AppZgtzsVO vo) {
         try {
+            AppEnterpriseVO appEnterpriseVO = new AppEnterpriseVO();
+            setSookaDataBase(appEnterpriseVO);
+            appEnterpriseVO.setBusEnterpriseId(vo.getXqzgtzs().getEnterpriseId());
 
-
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(vo.getXqzgtzs().getEnterpriseId());
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(appEnterpriseVO);
             SysDept sysDept = remoteSystemBaseService.selectDeptById(enterprise.getDeptId()).getData();
 
             //处理图片
@@ -472,14 +478,17 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
     public AjaxResult saveFCTZS(AppFctzsVO vo) {
         try {
             String logId = vo.getTzsFcyjgzs().getLogId();
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(logId);
-
+            TBusInspection tBusInspection  = new TBusInspection();
+            setSookaDataBase(tBusInspection);
+            tBusInspection.setBusLogId(logId);
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
+            setSookaDataBase(tBusLog);
             vo.getTzsFcyjgzs().setEnterpriseId(tBusLog.getBusEnterpriseId());
             vo.getTzsFcyjgzs().setEnterpriseName(tBusLog.getBusEnterpriseName());
             vo.getTzsFcyjgzs().setTzsId(UUID.fastUUID().toString());
             vo.getTzsFcyjgzs().setCreateTime(new Date());
 
-            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusLog.getBusEnterpriseId()) ;
+            TBusEnterprise enterprise = tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(tBusLog) ;
             SysDept sysDept = remoteSystemBaseService.selectDeptById(enterprise.getDeptId()).getData();
 
             String pictureBasePath = remoteSystemBaseService.configKeyapp("pictureBasePath").get("code").toString();
@@ -518,7 +527,10 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
     public AjaxResult getFCTZSdetail(AppFctzsVO vo) {
         try {
             Map map = new HashMap();
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(vo.getLogId());
+            TBusInspection tBusInspection  = new TBusInspection();
+            setSookaDataBase(tBusInspection);
+            tBusInspection.setBusLogId(vo.getLogId());
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
             TTzsXhxqzggzs tTzsXhxqzggzs = new TTzsXhxqzggzs();
             tTzsXhxqzggzs.setLogId(tBusLog.getBusLogId());
             List<TTzsXhxqzggzs> tzs = tTzsXhxqzggzsMapper.selectTTzsXhxqzggzsList(tTzsXhxqzggzs);
@@ -579,7 +591,8 @@ public class AppXunjianServiceImpl extends AppBaseService implements AppXunjianS
             TBusInspection tBusInspection = new TBusInspection();
             tBusInspection.setBusInspectionId(inp.getBusInspectionId());
             List<TBusInspection> log_list = tBusInspectionMapper.selectTBusInspectionList(tBusInspection);
-            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(inp.getBusLogId());
+            setSookaDataBase(inp);
+            TBusLog tBusLog = tBusLogMapper.selectTBusLogByBusLogId(inp);
             String y_risk_status = tBusLog.getRiskStatus();
             for(TBusInspection i:log_list){
                 if(i.getRiskStatus().equals("risk_status_2")){

src/main/java/com/sooka/sponest/data/emergency/domain/TBusEnterprise.java

@@ -29,7 +29,7 @@ public class TBusEnterprise extends BaseEntity
     private String userName;
 
     /** 账号(登录人的userid) */
-    private Long accountId;
+    private String accountId;
 
     /** 企业名称 */
     @Excel(name = "企业名称")

src/main/java/com/sooka/sponest/data/emergency/domain/TBusInspection.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,7 +19,7 @@ import java.util.Date;
 @Data
 public class
 
-TBusInspection extends BaseEntity
+TBusInspection extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/domain/TBusLog.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class TBusLog extends BaseEntity
+public class TBusLog extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/domain/TBusPatrolstation.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,10 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-01-30
  */
-public class TBusPatrolstation extends BaseEntity
+public class TBusPatrolstation extends BaseBusinessEntity
 {
 
-    String searchValue;
+    private String searchValue;
 
     private static final long serialVersionUID = 1L;
 
@@ -51,6 +52,14 @@ public class TBusPatrolstation extends BaseEntity
 
     private String delFlag;
 
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+
     public String getDelFlag() {
         return delFlag;
     }

src/main/java/com/sooka/sponest/data/emergency/domain/TBusTeam.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.emergency.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-01-06
  */
-public class TBusTeam extends BaseEntity
+public class TBusTeam extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/domain/TTzsXhxqzggzs.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.Date;
  * @date 2023-01-10
  */
 @Data
-public class TTzsXhxqzggzs extends BaseEntity
+public class TTzsXhxqzggzs extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/sooka/sponest/data/emergency/mapper/TBusLogMapper.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.emergency.mapper;
 
+import com.sooka.sponest.data.emergency.domain.TBusInspection;
 import com.sooka.sponest.data.emergency.domain.TBusLog;
 import com.sooka.sponest.data.emergency.domain.vo.ExportVo;
 
@@ -16,10 +17,10 @@ public interface TBusLogMapper
     /**
      * 查询日志
      *
-     * @param busLogId 日志主键
+     * @param vo 日志主键
      * @return 日志
      */
-    public TBusLog selectTBusLogByBusLogId(String busLogId);
+    public TBusLog selectTBusLogByBusLogId(Object vo);
 
     /**
      * 查询日志列表

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusEnterpriseServiceImpl.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.UUID;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.emergency.appmin.enterprise.domain.AppEnterpriseVO;
 import com.sooka.sponest.data.emergency.domain.TBusEnterprise;
 import com.sooka.sponest.data.emergency.mapper.TBusEnterpriseMapper;
 import com.sooka.sponest.data.emergency.service.ITBusEnterpriseService;
@@ -19,7 +21,7 @@ import java.util.List;
  * @date 2022-11-15
  */
 @Service
-public class TBusEnterpriseServiceImpl implements ITBusEnterpriseService
+public class TBusEnterpriseServiceImpl extends BaseServiceImpl implements ITBusEnterpriseService
 {
     @Autowired
     private TBusEnterpriseMapper tBusEnterpriseMapper;
@@ -33,7 +35,10 @@ public class TBusEnterpriseServiceImpl implements ITBusEnterpriseService
     @Override
     public TBusEnterprise selectTBusEnterpriseByBusEnterpriseId(String busEnterpriseId)
     {
-        return tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(busEnterpriseId);
+        AppEnterpriseVO appEnterpriseVO = new AppEnterpriseVO();
+        setSookaDataBase(appEnterpriseVO);
+        appEnterpriseVO.setBusEnterpriseId(busEnterpriseId);
+        return tBusEnterpriseMapper.selectTBusEnterpriseByBusEnterpriseId(appEnterpriseVO);
     }
 
     /**

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusLogServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sooka.sponest.data.emergency.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.emergency.domain.TBusInspection;
 import com.sooka.sponest.data.emergency.domain.TBusLog;
 import com.sooka.sponest.data.emergency.domain.vo.ExportVo;
 import com.sooka.sponest.data.emergency.mapper.TBusLogMapper;
@@ -17,7 +19,7 @@ import java.util.List;
  * @date 2022-11-15
  */
 @Service
-public class TBusLogServiceImpl implements ITBusLogService
+public class TBusLogServiceImpl extends BaseServiceImpl implements ITBusLogService
 {
     @Resource
     private TBusLogMapper tBusLogMapper;
@@ -31,7 +33,10 @@ public class TBusLogServiceImpl implements ITBusLogService
     @Override
     public TBusLog selectTBusLogByBusLogId(String busLogId)
     {
-        return tBusLogMapper.selectTBusLogByBusLogId(busLogId);
+        TBusInspection tBusInspection  = new TBusInspection();
+        setSookaDataBase(tBusInspection);
+        tBusInspection.setBusLogId(busLogId);
+        return tBusLogMapper.selectTBusLogByBusLogId(tBusInspection);
     }
 
     /**

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusTeamServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.emergency.service.impl;
 
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.emergency.domain.TBusTeam;
 import com.sooka.sponest.data.emergency.mapper.TBusTeamMapper;
 import com.sooka.sponest.data.emergency.service.ITBusTeamService;
@@ -16,7 +17,7 @@ import java.util.List;
  * @date 2023-01-06
  */
 @Service
-public class TBusTeamServiceImpl implements ITBusTeamService
+public class TBusTeamServiceImpl extends BaseServiceImpl implements ITBusTeamService
 {
     @Autowired
     private TBusTeamMapper tBusTeamMapper;
@@ -43,6 +44,7 @@ public class TBusTeamServiceImpl implements ITBusTeamService
     @DataScope(deptAlias = "t")
     public List<TBusTeam> selectTBusTeamList(TBusTeam tBusTeam)
     {
+        setSookaDataBase(tBusTeam);
         return tBusTeamMapper.selectTBusTeamList(tBusTeam);
     }
 

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

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

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

@@ -23,8 +23,8 @@
         select ifnull(team_id,'') team_id,
         ifnull(team_name,'') team_name,
         ifnull(team_category,'') team_category,
-        ifnull(dept_id,'') dept_id,
-        ifnull(dept_name,'') dept_name,
+        ifnull(t.dept_id,'') dept_id,
+        ifnull(t.dept_name,'') dept_name,
         ifnull(team_nature,'') team_nature,
         ifnull(team_pos,'') team_pos,
         ifnull(goodat,'') goodat,
@@ -33,6 +33,7 @@
         ifnull(emergency_phone,'') emergency_phone,
         ifnull(equipment_num,'') equipment_num
          from t_bus_team t
+        left join ${database_system}.sys_dept d on d.dept_id = t.dept_id
     </sql>
 
     <select id="selectTBusTeamList" parameterType="TBusTeam" resultMap="TBusTeamResult">