Merge remote-tracking branch 'origin/master'

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/SysLogininfor.java

@@ -52,6 +52,18 @@ public class SysLogininfor extends BaseEntity {
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
+    private Long userId;
+
+    @Override
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Long getInfoId() {
         return infoId;
     }

zd-api/zd-api-system/src/main/java/com/zd/system/api/domain/SysOperLog.java

@@ -111,6 +111,18 @@ public class SysOperLog extends BaseEntity {
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
+    private Long userId;
+
+    @Override
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public Long getOperId() {
         return operId;
     }

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -248,11 +247,11 @@ public class TokenController {
 
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (StringUtils.isNotNull(loginUser)) {
-            String username = loginUser.getUsername();
+            SysUser user = loginUser.getSysUser();
             // 删除用户缓存记录
             tokenService.delLoginUser(loginUser.getToken());
             // 记录用户退出日志
-            sysLoginService.logout(username);
+            sysLoginService.logout(user);
             // 删除一体机登录状态
             redisService.deleteObject(CacheConstants.LEARN_USER_KEY+loginUser.getUserid());
         }
@@ -263,11 +262,11 @@ public class TokenController {
     public R<?> logout(HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (StringUtils.isNotNull(loginUser)) {
-            String username = loginUser.getUsername();
+            SysUser user = loginUser.getSysUser();
             // 删除用户缓存记录
             tokenService.delLoginUser(loginUser.getToken());
             // 记录用户退出日志
-            sysLoginService.logout(username);
+            sysLoginService.logout(user);
         }
         return R.ok();
     }

zd-auth/src/main/java/com/zd/auth/service/SysLoginService.java

@@ -2,6 +2,7 @@ package com.zd.auth.service;
 
 import com.zd.common.core.constant.HttpStatus;
 import com.zd.common.core.exception.PreAuthorizeException;
+import com.zd.common.security.utils.SaveUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.zd.common.core.constant.Constants;
@@ -39,19 +40,19 @@ public class SysLoginService {
     public LoginUser login(String username, Integer loginType, String password) {
         // 用户名或密码为空 错误
         if (StringUtils.isAnyBlank(username, password)) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
             throw new ServiceException("用户/密码必须填写",530);
         }
         // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new ServiceException("用户密码不在指定范围",530);
         }
         // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new ServiceException("用户名不在指定范围",530);
         }
         // 查询用户信息
@@ -66,29 +67,29 @@ public class SysLoginService {
         }
 
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
             throw new ServiceException("登录用户：" + username + " 不存在",530);
         }
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new ServiceException("对不起，您的账号：" + username + " 已被删除",530);
         }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new ServiceException("对不起，您的账号：" + username + " 已停用",530);
         }
         if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
-            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
+//            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
             throw new ServiceException("用户不存在/密码错误",530);
         }
-        recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+        recordLogininfor(user, Constants.LOGIN_SUCCESS, "登录成功");
         return userInfo;
     }
 
-    public void logout(String loginName) {
-        recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
+    public void logout(SysUser user) {
+        recordLogininfor(user, Constants.LOGOUT, "退出成功");
     }
 
     /**
@@ -118,20 +119,20 @@ public class SysLoginService {
         if (R.FAIL == registerResult.getCode()) {
             throw new ServiceException(registerResult.getMsg());
         }
-        recordLogininfor(username, Constants.REGISTER, "注册成功");
+//        recordLogininfor(username, Constants.REGISTER, "注册成功");
     }
 
     /**
      * 记录登录信息
      *
-     * @param username 用户名
+     * @param user 用户名
      * @param status   状态
      * @param message  消息内容
      * @return
      */
-    public void recordLogininfor(String username, String status, String message) {
+    public void recordLogininfor(SysUser user, String status, String message) {
         SysLogininfor logininfor = new SysLogininfor();
-        logininfor.setUserName(username);
+        logininfor.setUserName(user.getUserName());
         logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
         logininfor.setMsg(message);
         // 日志状态
@@ -140,6 +141,8 @@ public class SysLoginService {
         } else if (Constants.LOGIN_FAIL.equals(status)) {
             logininfor.setStatus("1");
         }
+        logininfor.setUserId(user.getUserId());
+        logininfor.setDeptId(user.getDeptId());
         remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
     }
 }

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -330,7 +330,7 @@ public class PerPrefix {
     /**
      * 实验室项目：通知配置
      */
-    public static final String LABORATORY_NOTICECONFIG = "laboratory:noticeconfig";
+    public static final String LABORATORY_NOTICECONFIG = "laboratory:noticeconfig:";
 
     /**
      * 实验室项目：大屏通知计划

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNoticeconfigServiceImpl.java

@@ -1,6 +1,12 @@
 package com.zd.laboratory.service.impl;
 
 import java.util.List;
+
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.utils.DateUtils;
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.security.utils.SaveUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.laboratory.mapper.LabNoticeconfigMapper;
@@ -38,6 +44,7 @@ public class LabNoticeconfigServiceImpl implements ILabNoticeconfigService
      * @return 通知配置
      */
     @Override
+    @DataScope(deptAlias = "t", permi = PerPrefix.LABORATORY_NOTICECONFIG)
     public List<LabNoticeconfig> selectLabNoticeconfigList(LabNoticeconfig labNoticeconfig)
     {
         return labNoticeconfigMapper.selectLabNoticeconfigList(labNoticeconfig);
@@ -52,6 +59,7 @@ public class LabNoticeconfigServiceImpl implements ILabNoticeconfigService
     @Override
     public int insertLabNoticeconfig(LabNoticeconfig labNoticeconfig)
     {
+        SaveUtil.setCommonAttr(labNoticeconfig);
         return labNoticeconfigMapper.insertLabNoticeconfig(labNoticeconfig);
     }
 
@@ -64,6 +72,8 @@ public class LabNoticeconfigServiceImpl implements ILabNoticeconfigService
     @Override
     public int updateLabNoticeconfig(LabNoticeconfig labNoticeconfig)
     {
+        labNoticeconfig.setUpdateTime(DateUtils.getNowDate());
+        labNoticeconfig.setUpdateBy(SecurityUtils.getUsername());
         return labNoticeconfigMapper.updateLabNoticeconfig(labNoticeconfig);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNotifyplanServiceImpl.java

@@ -1,15 +1,5 @@
 package com.zd.laboratory.service.impl;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
@@ -18,24 +8,28 @@ import com.zd.common.core.utils.UrlFormatUtils;
 import com.zd.common.core.utils.poi.ExcelUtil;
 import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
-import com.zd.common.security.utils.SaveUtil;
-import com.zd.common.core.utils.SecurityUtils;
+import com.zd.laboratory.domain.LabNotifyplan;
 import com.zd.laboratory.domain.vo.LabNotifyplanExcelVO;
 import com.zd.laboratory.domain.vo.LabNotifyplanVO;
-import com.zd.laboratory.domain.vo.LabSecurityApplyVO;
+import com.zd.laboratory.mapper.LabNotifyplanMapper;
 import com.zd.laboratory.mqtt.constants.MqttConstants;
 import com.zd.laboratory.mqtt.entiy.MessageBody;
 import com.zd.laboratory.mqtt.service.impl.CommonSend;
+import com.zd.laboratory.service.ILabNotifyplanService;
 import com.zd.system.api.domain.SysUser;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.laboratory.mapper.LabNotifyplanMapper;
-import com.zd.laboratory.domain.LabNotifyplan;
-import com.zd.laboratory.service.ILabNotifyplanService;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 /**
  * 大屏通知计划Service业务层处理
@@ -143,8 +137,8 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @param request
      * @return
      */
-    //@DataScope(deptAlias = "t" , userAlias = "t" , permi = PerPrefix.LABORATORY_NOTIFYPLAN)
     @Override
+    @DataScope(deptAlias = "t" , permi = PerPrefix.LABORATORY_NOTIFYPLAN)
     public List<LabNotifyplanVO> selectLabNotifyplanListVO(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         List<LabNotifyplanVO> list =labNotifyplanMapper.selectLabNotifyplanListVO(labNotifyplan);
         InputStream intstream =null;
@@ -220,8 +214,8 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
      * @param request
      * @return
      */
-    //@DataScope(deptAlias = "t" , userAlias = "t" , permi = PerPrefix.LABORATORY_WORKNOTIFYPLAN)
     @Override
+    @DataScope(deptAlias = "t" , permi = PerPrefix.LABORATORY_WORKNOTIFYPLAN)
     public List<LabNotifyplanVO> selectLabWorkNotifyplanListVO(LabNotifyplanVO labNotifyplan, HttpServletRequest request) {
         List<LabNotifyplanVO> list =labNotifyplanMapper.selectLabNotifyplanListVO(labNotifyplan);
         InputStream intstream =null;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRotationChartServiceImpl.java

@@ -3,10 +3,12 @@ package com.zd.laboratory.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
+import com.zd.common.datascope.annotation.DataScope;
 import com.zd.common.security.service.TokenService;
 import com.zd.common.security.utils.SaveUtil;
 
@@ -63,6 +65,7 @@ public class LabRotationChartServiceImpl implements ILabRotationChartService
      * @return 轮播图
      */
     @Override
+    @DataScope(deptAlias = "c", permi = PerPrefix.LABORATORY_CHART)
     public List<LabRotationChart> selectLabRotationChartList(LabRotationChart labRotationChart)
     {
         return labRotationChartMapper.selectLabRotationChartList(labRotationChart);
@@ -106,11 +109,7 @@ public class LabRotationChartServiceImpl implements ILabRotationChartService
     @Override
     public int insertLabRotationChart(LabRotationChart labRotationChart)
     {
-        //设置创建时间
-        labRotationChart.setCreateTime(DateUtils.getNowDate());
-        //设置创建人
-        labRotationChart.setCreateBy(tokenService.getLoginUser().getNickName());
-        labRotationChart.setUserId(SecurityUtils.getUserId());
+        SaveUtil.setCommonAttr(labRotationChart);
         return labRotationChartMapper.insertLabRotationChart(labRotationChart);
     }
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabNoticeconfigMapper.xml

@@ -1,75 +1,119 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabNoticeconfigMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNoticeconfig" id="LabNoticeconfigResult">
-        <result property="id"    column="id"    />
-        <result property="riskVoice"    column="risk_voice"    />
-        <result property="riskPhone"    column="risk_phone"    />
-        <result property="riskMessage"    column="risk_message"    />
-        <result property="riskRadio"    column="risk_radio"    />
-        <result property="exitRadio"    column="exit_radio"    />
-        <result property="exitVoice"    column="exit_voice"    />
-        <result property="exitPhone"    column="exit_phone"    />
-        <result property="exitMessage"    column="exit_message"    />
+        <result property="id" column="id"/>
+        <result property="riskVoice" column="risk_voice"/>
+        <result property="riskPhone" column="risk_phone"/>
+        <result property="riskMessage" column="risk_message"/>
+        <result property="riskRadio" column="risk_radio"/>
+        <result property="exitRadio" column="exit_radio"/>
+        <result property="exitVoice" column="exit_voice"/>
+        <result property="exitPhone" column="exit_phone"/>
+        <result property="exitMessage" column="exit_message"/>
     </resultMap>
 
     <sql id="selectLabNoticeconfigVo">
-        select id, risk_voice, risk_phone, risk_message,risk_radio, exit_radio, exit_voice, exit_phone, exit_message from lab_noticeconfig
+        select id,
+               risk_voice,
+               risk_phone,
+               risk_message,
+               risk_radio,
+               exit_radio,
+               exit_voice,
+               exit_phone,
+               exit_message
+        from lab_noticeconfig
     </sql>
     <sql id="selectLabNoticeconfigListVo">
-        select t.id, t.risk_voice, t.risk_phone, t.risk_message,t.risk_radio, t.exit_radio, t.exit_voice, t.exit_phone, t.exit_message from lab_noticeconfig as t
+        select t.id,
+               t.risk_voice,
+               t.risk_phone,
+               t.risk_message,
+               t.risk_radio,
+               t.exit_radio,
+               t.exit_voice,
+               t.exit_phone,
+               t.exit_message
+        from lab_noticeconfig as t
     </sql>
-    <select id="selectLabNoticeconfigList" parameterType="com.zd.laboratory.domain.LabNoticeconfig" resultMap="LabNoticeconfigResult">
-        <include refid="selectLabNoticeconfigVo"/>
+    <select id="selectLabNoticeconfigList" parameterType="com.zd.laboratory.domain.LabNoticeconfig"
+            resultMap="LabNoticeconfigResult">
+        <include refid="selectLabNoticeconfigListVo"/>
         <where>
-            <if test="riskVoice != null  and riskVoice != ''"> and risk_voice = #{riskVoice}</if>
-            <if test="riskPhone != null  and riskPhone != ''"> and risk_phone = #{riskPhone}</if>
-            <if test="riskMessage != null  and riskMessage != ''"> and risk_message = #{riskMessage}</if>
-            <if test="exitRadio != null  and exitRadio != ''"> and exit_radio = #{exitRadio}</if>
-            <if test="exitVoice != null  and exitVoice != ''"> and exit_voice = #{exitVoice}</if>
-            <if test="exitPhone != null  and exitPhone != ''"> and exit_phone = #{exitPhone}</if>
-            <if test="exitMessage != null  and exitMessage != ''"> and exit_message = #{exitMessage}</if>
+            <if test="riskVoice != null  and riskVoice != ''">and risk_voice = #{riskVoice}</if>
+            <if test="riskPhone != null  and riskPhone != ''">and risk_phone = #{riskPhone}</if>
+            <if test="riskMessage != null  and riskMessage != ''">and risk_message = #{riskMessage}</if>
+            <if test="exitRadio != null  and exitRadio != ''">and exit_radio = #{exitRadio}</if>
+            <if test="exitVoice != null  and exitVoice != ''">and exit_voice = #{exitVoice}</if>
+            <if test="exitPhone != null  and exitPhone != ''">and exit_phone = #{exitPhone}</if>
+            <if test="exitMessage != null  and exitMessage != ''">and exit_message = #{exitMessage}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
     </select>
 
-    <select id="selectLabNoticeconfigById"  resultMap="LabNoticeconfigResult">
+    <select id="selectLabNoticeconfigById" resultMap="LabNoticeconfigResult">
         <include refid="selectLabNoticeconfigVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertLabNoticeconfig" parameterType="com.zd.laboratory.domain.LabNoticeconfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertLabNoticeconfig" parameterType="com.zd.laboratory.domain.LabNoticeconfig" useGeneratedKeys="true"
+            keyProperty="id">
         insert into lab_noticeconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="riskVoice != null">risk_voice,</if>
+            <if test="riskVoice != null">risk_voice,</if>
+
+            <if test="riskPhone != null">risk_phone,</if>
+
+            <if test="riskMessage != null">risk_message,</if>
+
+            <if test="riskRadio != null">risk_radio,</if>
+
+            <if test="exitRadio != null">exit_radio,</if>
 
-    <if test="riskPhone != null">risk_phone,</if>
+            <if test="exitVoice != null">exit_voice,</if>
 
-    <if test="riskMessage != null">risk_message,</if>
+            <if test="exitPhone != null">exit_phone,</if>
 
-    <if test="riskRadio != null">risk_radio,</if>
+            <if test="exitMessage != null">exit_message,</if>
+            <if test="userId != null">user_id,</if>
 
-    <if test="exitRadio != null">exit_radio,</if>
+            <if test="createBy != null">create_by,</if>
 
-    <if test="exitVoice != null">exit_voice,</if>
+            <if test="updateBy != null">update_by,</if>
 
-    <if test="exitPhone != null">exit_phone,</if>
+            <if test="deptId != null">dept_id,</if>
 
-    <if test="exitMessage != null">exit_message,</if>
+            <if test="deptName != null">dept_name,</if>
 
-         </trim>
+            <if test="createTime != null">create_time,</if>
+
+            <if test="updateTime != null">update_time,</if>
+
+            <if test="remark != null">remark,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="riskVoice != null">#{riskVoice},</if>
-    <if test="riskPhone != null">#{riskPhone},</if>
-    <if test="riskMessage != null">#{riskMessage},</if>
-    <if test="riskRadio != null">#{riskRadio},</if>
-    <if test="exitRadio != null">#{exitRadio},</if>
-    <if test="exitVoice != null">#{exitVoice},</if>
-    <if test="exitPhone != null">#{exitPhone},</if>
-    <if test="exitMessage != null">#{exitMessage},</if>
-         </trim>
+            <if test="riskVoice != null">#{riskVoice},</if>
+            <if test="riskPhone != null">#{riskPhone},</if>
+            <if test="riskMessage != null">#{riskMessage},</if>
+            <if test="riskRadio != null">#{riskRadio},</if>
+            <if test="exitRadio != null">#{exitRadio},</if>
+            <if test="exitVoice != null">#{exitVoice},</if>
+            <if test="exitPhone != null">#{exitPhone},</if>
+            <if test="exitMessage != null">#{exitMessage},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
     </insert>
 
     <update id="updateLabNoticeconfig" parameterType="com.zd.laboratory.domain.LabNoticeconfig">
@@ -83,12 +127,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exitVoice != null">exit_voice = #{exitVoice},</if>
             <if test="exitPhone != null">exit_phone = #{exitPhone},</if>
             <if test="exitMessage != null">exit_message = #{exitMessage},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>
 
-    <delete id="deleteLabNoticeconfigById" >
-        delete from lab_noticeconfig where id = #{id}
+    <delete id="deleteLabNoticeconfigById">
+        delete
+        from lab_noticeconfig
+        where id = #{id}
     </delete>
 
     <delete id="deleteLabNoticeconfigByIds">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabNotifyplanMapper.xml

@@ -111,8 +111,8 @@
                 create_username like concat('%', #{searchValue}, '%')
                 )
             </if>
-            <!-- 数据范围过滤  ${params.dataScope}-->
-
+            <!-- 数据范围过滤  -->
+            ${params.dataScope}
         </where>
         order by create_time desc
     </select>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRotationChartMapper.xml

@@ -72,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tagCard == 3">
                 AND DATE_FORMAT(c.valid_end_time,'%y%m%d') &lt; DATE_FORMAT(NOW(),'%y%m%d')
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by c.img_range asc,c.img_order desc
     </select>
@@ -141,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <if test="createTime != null">create_time,</if>
 
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
     <if test="imgName != null">#{imgName},</if>
@@ -154,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <if test="userId != null">#{userId},</if>
     <if test="createBy != null">#{createBy},</if>
     <if test="createTime != null">#{createTime},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -171,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysLogininforServiceImpl.java

@@ -2,6 +2,8 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.datascope.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.system.api.domain.SysLogininfor;
@@ -36,6 +38,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService {
      * @return 登录记录集合
      */
     @Override
+    @DataScope(deptAlias = "t", userAlias = "t", permi = PerPrefix.SYSTEM_LOGININFOR)
     public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
         return logininforMapper.selectLogininforList(logininfor);
     }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysOperLogServiceImpl.java

@@ -2,6 +2,8 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.datascope.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zd.system.api.domain.SysOperLog;
@@ -35,6 +37,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
+    @DataScope(deptAlias = "t", permi = PerPrefix.SYSTEM_OPERLOG)
     @Override
     public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
         return operLogMapper.selectOperLogList(operLog);

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPostServiceImpl.java

@@ -2,6 +2,9 @@ package com.zd.system.service.impl;
 
 import java.util.List;
 
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.datascope.annotation.DataScope;
+import com.zd.common.security.utils.SaveUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +36,7 @@ public class SysPostServiceImpl implements ISysPostService {
      * @return 岗位信息集合
      */
     @Override
+    @DataScope(deptAlias = "t", permi = PerPrefix.SYSTEM_POST)
     public List<SysPost> selectPostList(SysPost post) {
         return postMapper.selectPostList(post);
     }
@@ -149,6 +153,7 @@ public class SysPostServiceImpl implements ISysPostService {
      */
     @Override
     public int insertPost(SysPost post) {
+        SaveUtil.setCommonAttr(post);
         return postMapper.insertPost(post);
     }
 

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -14,13 +14,15 @@
     </resultMap>
 
     <insert id="insertLogininfor" parameterType="com.zd.system.api.domain.SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate())
+		insert into sys_logininfor (user_name, status, ipaddr, msg, access_time,
+                user_id,dept_id )
+		values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate(),
+                #{userId}, #{deptId} )
 	</insert>
 
     <select id="selectLogininforList" parameterType="com.zd.system.api.domain.SysLogininfor"
             resultMap="SysLogininforResult">
-        select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
+        select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor t
         <where>
             <if test="ipaddr != null and ipaddr != ''">
                 AND ipaddr like concat('%', #{ipaddr}, '%')
@@ -43,6 +45,8 @@
                 user_name like concat('%', #{searchValue}, '%')
                 )
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by info_id desc
     </select>

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -23,14 +23,32 @@
     </resultMap>
 
     <sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time
-        from sys_oper_log
+        select oper_id,
+               title,
+               business_type,
+               method,
+               request_method,
+               operator_type,
+               oper_name,
+               dept_name,
+               oper_url,
+               oper_ip,
+               oper_param,
+               json_result,
+               status,
+               error_msg,
+               oper_time
+        from sys_oper_log t
     </sql>
 
     <insert id="insertOperlog" parameterType="com.zd.system.api.domain.SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
-	</insert>
+        insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name,
+                                 oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time,
+                                 user_id, dept_id)
+        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName},
+                #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate(),
+                #{userId}, #{deptId})
+    </insert>
 
     <select id="selectOperLogList" parameterType="com.zd.system.api.domain.SysOperLog" resultMap="SysOperLogResult">
         <include refid="selectOperLogVo"/>
@@ -59,18 +77,20 @@
             <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by oper_id desc
     </select>
 
-    <delete id="deleteOperLogByIds" >
+    <delete id="deleteOperLogByIds">
         delete from sys_oper_log where oper_id in
         <foreach collection="array" item="operId" open="(" separator="," close=")">
             #{operId}
         </foreach>
     </delete>
 
-    <select id="selectOperLogById"  resultMap="SysOperLogResult">
+    <select id="selectOperLogById" resultMap="SysOperLogResult">
         <include refid="selectOperLogVo"/>
         where oper_id = #{operId}
     </select>

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -19,7 +19,7 @@
 
     <sql id="selectPostVo">
         select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
-		from sys_post
+		from sys_post t
     </sql>
 
     <select id="selectPostList" parameterType="com.zd.system.domain.SysPost" resultMap="SysPostResult">
@@ -40,6 +40,8 @@
                 post_name like concat('%', #{searchValue}, '%')
                 )
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by post_sort desc,create_time desc
     </select>
@@ -111,6 +113,9 @@
         <if test="status != null and status != ''">status,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
+
+        <if test="userId != null">user_id,</if>
+        <if test="deptId != null">dept_id,</if>
         create_time
         )values(
         <if test="postId != null and postId != 0">#{postId},</if>
@@ -120,6 +125,9 @@
         <if test="status != null and status != ''">#{status},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
+
+        <if test="userId != null">#{userId},</if>
+        <if test="deptId != null">#{deptId},</if>
         sysdate()
         )
     </insert>