七个数据隔离 水源，救援设备，起降点，气象站，放火站，防火队，森林管理

mybusiness/src/main/java/com/business/slfh/manager/stationfiremanager/domain/TResStationfire.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 t_res_stationfire
  * 
@@ -22,6 +24,20 @@ public class TResStationfire extends BaseEntity
     /** $column.columnComment */
     private String id;
 
+    private List depts;
+    /**
+     * 所属林场部门id
+     */
+    private Long deptId;
+    /**
+     * 所属林场部门名称
+     */
+    private String deptName;
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String status;

mybusiness/src/main/java/com/business/slfh/manager/stationfiremanager/service/impl/TResStationfireServiceImpl.java

@@ -5,8 +5,11 @@ import java.util.List;
 import com.business.slfh.manager.stationfiremanager.domain.TResStationfire;
 import com.business.slfh.manager.stationfiremanager.mapper.TResStationfireMapper;
 import com.business.slfh.manager.stationfiremanager.service.ITResStationfireService;
+import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +26,8 @@ public class TResStationfireServiceImpl implements ITResStationfireService
 {
     @Resource
     private TResStationfireMapper tResStationfireMapper;
+    @Resource
+    private UserInfoUtil userInfoUtil;
 
     /**
      * 查询【请填写功能名称】
@@ -43,6 +48,7 @@ public class TResStationfireServiceImpl implements ITResStationfireService
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "t")
     public List<TResStationfire> selectTResStationfireList(TResStationfire tResStationfire)
     {
         return tResStationfireMapper.selectTResStationfireList(tResStationfire);
@@ -58,6 +64,10 @@ public class TResStationfireServiceImpl implements ITResStationfireService
     public int insertTResStationfire(TResStationfire tResStationfire)
     {
         tResStationfire.setCreateTime(DateUtils.getNowDate());
+        SysUser sysUser = userInfoUtil.getLoginUserInfo();
+        tResStationfire.setCreateBy(sysUser.getUserName());
+        tResStationfire.setCreateUserId(sysUser.getUserId());
+        tResStationfire.setDeptId(sysUser.getDeptId());
         return tResStationfireMapper.insertTResStationfire(tResStationfire);
     }
 

mybusiness/src/main/java/com/business/slfh/manager/stationforestmanager/domain/TResStationforest.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 t_res_stationforest
  * 
@@ -25,6 +27,20 @@ public class TResStationforest extends BaseEntity
     /** $column.columnComment */
     private String id;
 
+    private List depts;
+    /**
+     * 所属林场部门id
+     */
+    //private Long deptId;
+    /**
+     * 所属林场部门名称
+     */
+    private String deptName;
+    /**
+     * 创建者ID
+     */
+    //private Long createUserId;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String status;

mybusiness/src/main/java/com/business/slfh/manager/stationforestmanager/service/impl/TResStationforestServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.List;
 
 import com.business.slfh.manager.stationforestmanager.domain.TResStationforest;
 import com.business.slfh.manager.stationforestmanager.mapper.TResStationforestMapper;
+import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.business.slfh.manager.stationforestmanager.service.ITResStationforestService;
@@ -23,6 +26,8 @@ public class TResStationforestServiceImpl implements ITResStationforestService
 {
     @Resource
     private TResStationforestMapper tResStationforestMapper;
+    @Resource
+    private UserInfoUtil userInfoUtil;
 
     /**
      * 查询【请填写功能名称】
@@ -43,6 +48,7 @@ public class TResStationforestServiceImpl implements ITResStationforestService
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "t")
     public List<TResStationforest> selectTResStationforestList(TResStationforest tResStationforest)
     {
         return tResStationforestMapper.selectTResStationforestList(tResStationforest);
@@ -58,6 +64,10 @@ public class TResStationforestServiceImpl implements ITResStationforestService
     public int insertTResStationforest(TResStationforest tResStationforest)
     {
         tResStationforest.setCreateTime(DateUtils.getNowDate());
+        SysUser sysUser = userInfoUtil.getLoginUserInfo();
+        tResStationforest.setCreateBy(sysUser.getUserName());
+        tResStationforest.setCreateUserId(sysUser.getUserId());
+        tResStationforest.setDeptId(sysUser.getDeptId());
         return tResStationforestMapper.insertTResStationforest(tResStationforest);
     }
 

mybusiness/src/main/java/com/business/slfh/manager/stationlandmanager/domain/TResStationland.java

@@ -2,15 +2,21 @@ package com.business.slfh.manager.stationlandmanager.domain;
 
 import com.sooka.common.annotation.Excel;
 import com.sooka.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 t_res_stationland
  * 
  * @author lei
  * @date 2021-05-06
  */
+@Getter
+@Setter
 public class TResStationland extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -18,6 +24,20 @@ public class TResStationland extends BaseEntity
     /** $column.columnComment */
     private String id;
 
+    private List depts;
+    /**
+     * 所属林场部门id
+     */
+    private Long deptId;
+    /**
+     * 所属林场部门名称
+     */
+    private String deptName;
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String status;

mybusiness/src/main/java/com/business/slfh/manager/stationlandmanager/service/impl/TResStationlandServiceImpl.java

@@ -5,8 +5,11 @@ import java.util.List;
 import com.business.slfh.manager.stationlandmanager.domain.TResStationland;
 import com.business.slfh.manager.stationlandmanager.mapper.TResStationlandMapper;
 import com.business.slfh.manager.stationlandmanager.service.ITResStationlandService;
+import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +26,8 @@ public class TResStationlandServiceImpl implements ITResStationlandService
 {
     @Resource
     private TResStationlandMapper tResStationlandMapper;
+    @Resource
+    private UserInfoUtil userInfoUtil;
 
     /**
      * 查询【请填写功能名称】
@@ -43,6 +48,7 @@ public class TResStationlandServiceImpl implements ITResStationlandService
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "t")
     public List<TResStationland> selectTResStationlandList(TResStationland tResStationland)
     {
         return tResStationlandMapper.selectTResStationlandList(tResStationland);
@@ -58,6 +64,10 @@ public class TResStationlandServiceImpl implements ITResStationlandService
     public int insertTResStationland(TResStationland tResStationland)
     {
         tResStationland.setCreateTime(DateUtils.getNowDate());
+        SysUser sysUser = userInfoUtil.getLoginUserInfo();
+        tResStationland.setCreateBy(sysUser.getUserName());
+        tResStationland.setCreateUserId(sysUser.getUserId());
+        tResStationland.setDeptId(sysUser.getDeptId());
         return tResStationlandMapper.insertTResStationland(tResStationland);
     }
 

mybusiness/src/main/java/com/business/slfh/manager/stationteammanager/domain/TResStationteam.java

@@ -7,6 +7,8 @@ import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 t_res_stationteam
  * 
@@ -22,6 +24,20 @@ public class TResStationteam extends BaseEntity
     /** $column.columnComment */
     private String id;
 
+    private List depts;
+    /**
+     * 所属林场部门id
+     */
+    private Long deptId;
+    /**
+     * 所属林场部门名称
+     */
+    private String deptName;
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String status;

mybusiness/src/main/java/com/business/slfh/manager/stationteammanager/service/impl/TResStationteamServiceImpl.java

@@ -4,8 +4,11 @@ import java.util.List;
 
 import com.business.slfh.manager.stationteammanager.domain.TResStationteam;
 import com.business.slfh.manager.stationteammanager.mapper.TResStationteamMapper;
+import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.business.slfh.manager.stationteammanager.service.ITResStationteamService;
@@ -23,6 +26,8 @@ public class TResStationteamServiceImpl implements ITResStationteamService
 {
     @Resource
     private TResStationteamMapper tResStationteamMapper;
+    @Resource
+    private UserInfoUtil userInfoUtil;
 
     /**
      * 查询【请填写功能名称】
@@ -43,6 +48,7 @@ public class TResStationteamServiceImpl implements ITResStationteamService
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "t")
     public List<TResStationteam> selectTResStationteamList(TResStationteam tResStationteam)
     {
         return tResStationteamMapper.selectTResStationteamList(tResStationteam);
@@ -58,6 +64,10 @@ public class TResStationteamServiceImpl implements ITResStationteamService
     public int insertTResStationteam(TResStationteam tResStationteam)
     {
         tResStationteam.setCreateTime(DateUtils.getNowDate());
+        SysUser sysUser = userInfoUtil.getLoginUserInfo();
+        tResStationteam.setCreateBy(sysUser.getUserName());
+        tResStationteam.setCreateUserId(sysUser.getUserId());
+        tResStationteam.setDeptId(sysUser.getDeptId());
         return tResStationteamMapper.insertTResStationteam(tResStationteam);
     }
 

mybusiness/src/main/java/com/business/slfh/manager/stationweathermanager/domain/TResStationweather.java

@@ -2,15 +2,21 @@ package com.business.slfh.manager.stationweathermanager.domain;
 
 import com.sooka.common.annotation.Excel;
 import com.sooka.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】对象 t_res_stationweather
  * 
  * @author lei
  * @date 2021-05-06
  */
+@Getter
+@Setter
 public class TResStationweather extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -18,6 +24,20 @@ public class TResStationweather extends BaseEntity
     /** $column.columnComment */
     private String id;
 
+    private List depts;
+    /**
+     * 所属林场部门id
+     */
+    private Long deptId;
+    /**
+     * 所属林场部门名称
+     */
+    private String deptName;
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
     /** $column.columnComment */
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String status;

mybusiness/src/main/java/com/business/slfh/manager/stationweathermanager/service/impl/TResStationweatherServiceImpl.java

@@ -5,8 +5,11 @@ import java.util.List;
 import com.business.slfh.manager.stationweathermanager.domain.TResStationweather;
 import com.business.slfh.manager.stationweathermanager.mapper.TResStationweatherMapper;
 import com.business.slfh.manager.stationweathermanager.service.ITResStationweatherService;
+import com.business.slfh.tools.UserInfoUtil;
+import com.sooka.common.annotation.DataScope;
 import com.sooka.common.core.text.Convert;
 import com.sooka.common.utils.DateUtils;
+import com.sooka.system.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +26,8 @@ public class TResStationweatherServiceImpl implements ITResStationweatherService
 {
     @Resource
     private TResStationweatherMapper tResStationweatherMapper;
+    @Resource
+    private UserInfoUtil userInfoUtil;
 
     /**
      * 查询【请填写功能名称】
@@ -43,6 +48,7 @@ public class TResStationweatherServiceImpl implements ITResStationweatherService
      * @return 【请填写功能名称】
      */
     @Override
+    @DataScope(deptAlias = "t")
     public List<TResStationweather> selectTResStationweatherList(TResStationweather tResStationweather)
     {
         return tResStationweatherMapper.selectTResStationweatherList(tResStationweather);
@@ -58,6 +64,10 @@ public class TResStationweatherServiceImpl implements ITResStationweatherService
     public int insertTResStationweather(TResStationweather tResStationweather)
     {
         tResStationweather.setCreateTime(DateUtils.getNowDate());
+        SysUser sysUser = userInfoUtil.getLoginUserInfo();
+        tResStationweather.setCreateBy(sysUser.getUserName());
+        tResStationweather.setCreateUserId(sysUser.getUserId());
+        tResStationweather.setDeptId(sysUser.getDeptId());
         return tResStationweatherMapper.insertTResStationweather(tResStationweather);
     }
 

mybusiness/src/main/resources/mapper/grid/manager/TResStationfireMapper.xml

@@ -19,15 +19,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="contactUser"    column="contact_user"    />
         <result property="contactPhone"    column="contact_phone"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="createUserId"    column="create_user_id"    />
     </resultMap>
 
     <sql id="selectTResStationfireVo">
-        select id, status, remark, del_flag, create_by, create_time, update_by, update_time, name, longitude, latitude, address, contact_user, contact_phone from t_res_stationfire
+        select t.dept_id,
+        (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.create_user_id, t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.name, t.longitude, t.latitude, t.address, t.contact_user, t.contact_phone from t_res_stationfire t
     </sql>
 
     <select id="selectTResStationfireList" parameterType="TResStationfire" resultMap="TResStationfireResult">
         <include refid="selectTResStationfireVo"/>
-        <where>  
+        <where>
+            1=1
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
@@ -35,7 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contactUser != null  and contactUser != ''"> and contact_user = #{contactUser}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTResStationfireById" parameterType="String" resultMap="TResStationfireResult">
@@ -60,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address,</if>
             <if test="contactUser != null">contact_user,</if>
             <if test="contactPhone != null">contact_phone,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -76,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">#{address},</if>
             <if test="contactUser != null">#{contactUser},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
          </trim>
     </insert>
 
@@ -95,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address = #{address},</if>
             <if test="contactUser != null">contact_user = #{contactUser},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
         </trim>
         where id = #{id}
     </update>

mybusiness/src/main/resources/mapper/grid/manager/TResStationforestMapper.xml

@@ -20,17 +20,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contactUser"    column="contact_user"    />
         <result property="contactPhone"    column="contact_phone"    />
         <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="forestType"    column="forest_type"    />
     </resultMap>
 
     <sql id="selectTResStationforestVo">
-        select forest_type, id, status, remark, del_flag, create_by, create_time, update_by, update_time, name, longitude, latitude, address, contact_user, contact_phone, dept_id, create_user_id from t_res_stationforest
+        select (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.forest_type, t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.name, t.longitude, t.latitude, t.address, t.contact_user, t.contact_phone, t.dept_id, t.create_user_id from t_res_stationforest t
     </sql>
 
     <select id="selectTResStationforestList" parameterType="TResStationforest" resultMap="TResStationforestResult">
         <include refid="selectTResStationforestVo"/>
-        <where>  
+        <where>
+            1=1
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
@@ -42,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
             <if test="forestType != null  and forestType != ''"> and forest_type = #{forestType}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTResStationforestById" parameterType="String" resultMap="TResStationforestResult">
@@ -69,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="createUserId != null">create_user_id,</if>
             <if test="forestType != null">forest_type,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -88,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="createUserId != null">#{createUserId},</if>
             <if test="forestType != null">#{forestType},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
          </trim>
     </insert>
 
@@ -110,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="createUserId != null">create_user_id = #{createUserId},</if>
             <if test="forestType != null">forest_type = #{forestType},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
         </trim>
         where id = #{id}
     </update>

mybusiness/src/main/resources/mapper/grid/manager/TResStationlandMapper.xml

@@ -19,15 +19,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="contactUser"    column="contact_user"    />
         <result property="contactPhone"    column="contact_phone"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="createUserId"    column="create_user_id"    />
     </resultMap>
 
     <sql id="selectTResStationlandVo">
-        select id, status, remark, del_flag, create_by, create_time, update_by, update_time, name, longitude, latitude, address, contact_user, contact_phone from t_res_stationland
+        select t.dept_id,
+        (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.create_user_id,
+        t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.name, t.longitude, t.latitude, t.address, t.contact_user, t.contact_phone from t_res_stationland t
     </sql>
 
     <select id="selectTResStationlandList" parameterType="TResStationland" resultMap="TResStationlandResult">
         <include refid="selectTResStationlandVo"/>
-        <where>  
+        <where>
+            1=1
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
@@ -35,7 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contactUser != null  and contactUser != ''"> and contact_user = #{contactUser}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTResStationlandById" parameterType="String" resultMap="TResStationlandResult">
@@ -60,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address,</if>
             <if test="contactUser != null">contact_user,</if>
             <if test="contactPhone != null">contact_phone,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -76,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">#{address},</if>
             <if test="contactUser != null">#{contactUser},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
          </trim>
     </insert>
 
@@ -95,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address = #{address},</if>
             <if test="contactUser != null">contact_user = #{contactUser},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
         </trim>
         where id = #{id}
     </update>

mybusiness/src/main/resources/mapper/grid/manager/TResStationteamMapper.xml

@@ -19,15 +19,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="contactUser"    column="contact_user"    />
         <result property="contactPhone"    column="contact_phone"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="createUserId"    column="create_user_id"    />
     </resultMap>
 
     <sql id="selectTResStationteamVo">
-        select id, status, remark, del_flag, create_by, create_time, update_by, update_time, name, longitude, latitude, address, contact_user, contact_phone from t_res_stationteam
+        select t.dept_id,
+        (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.create_user_id,
+        t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.name, t.longitude, t.latitude, t.address, t.contact_user, t.contact_phone from t_res_stationteam t
     </sql>
 
     <select id="selectTResStationteamList" parameterType="TResStationteam" resultMap="TResStationteamResult">
         <include refid="selectTResStationteamVo"/>
-        <where>  
+        <where>
+            1=1
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
@@ -35,7 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contactUser != null  and contactUser != ''"> and contact_user = #{contactUser}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTResStationteamById" parameterType="String" resultMap="TResStationteamResult">
@@ -60,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address,</if>
             <if test="contactUser != null">contact_user,</if>
             <if test="contactPhone != null">contact_phone,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -76,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">#{address},</if>
             <if test="contactUser != null">#{contactUser},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
          </trim>
     </insert>
 
@@ -95,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address = #{address},</if>
             <if test="contactUser != null">contact_user = #{contactUser},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
         </trim>
         where id = #{id}
     </update>

mybusiness/src/main/resources/mapper/grid/manager/TResStationweatherMapper.xml

@@ -19,15 +19,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address"    column="address"    />
         <result property="contactUser"    column="contact_user"    />
         <result property="contactPhone"    column="contact_phone"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="createUserId"    column="create_user_id"    />
     </resultMap>
 
     <sql id="selectTResStationweatherVo">
-        select id, status, remark, del_flag, create_by, create_time, update_by, update_time, name, longitude, latitude, address, contact_user, contact_phone from t_res_stationweather
+        select t.dept_id,
+        (select dept_name from sys_dept where dept_id=t.dept_id) dept_name,
+        t.create_user_id, t.id, t.status, t.remark, t.del_flag, t.create_by, t.create_time, t.update_by, t.update_time, t.name, t.longitude, t.latitude, t.address, t.contact_user, t.contact_phone from t_res_stationweather t
     </sql>
 
     <select id="selectTResStationweatherList" parameterType="TResStationweather" resultMap="TResStationweatherResult">
         <include refid="selectTResStationweatherVo"/>
-        <where>  
+        <where>
+            1=1
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
@@ -35,7 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contactUser != null  and contactUser != ''"> and contact_user = #{contactUser}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
     
     <select id="selectTResStationweatherById" parameterType="String" resultMap="TResStationweatherResult">
@@ -60,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address,</if>
             <if test="contactUser != null">contact_user,</if>
             <if test="contactPhone != null">contact_phone,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
@@ -76,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">#{address},</if>
             <if test="contactUser != null">#{contactUser},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
          </trim>
     </insert>
 
@@ -95,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="address != null">address = #{address},</if>
             <if test="contactUser != null">contact_user = #{contactUser},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
         </trim>
         where id = #{id}
     </update>