应急

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

@@ -23,11 +23,8 @@ public class AppTeamController extends BaseController {
     @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,7 @@
 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;
@@ -19,9 +20,10 @@ public class AppTeamServiceImpl extends BaseServiceImpl implements AppTeamServic
     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/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/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/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">