大屏bug修改及编辑校验用户密码

bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbPeopleController.java

@@ -6,6 +6,7 @@ import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.system.api.domain.SysUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -158,5 +159,16 @@ public class TbPeopleController extends BaseController {
         List<TbPeople> list = tbPeopleService.getList();
         return AjaxResult.success(list);
     }
+
+    /**
+     * 编辑时校验用户密码
+     * @param sysUser
+     * @return
+     */
+    @PostMapping("/sendPassWord")
+    public AjaxResult sendPassWord(@RequestBody SysUser sysUser)
+    {
+        return tbPeopleService.sendPassWord(sysUser);
+    }
 }
 

bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbPeopleMapper.java

@@ -2,6 +2,7 @@ package com.bonus.base.mapper;
 
 import com.bonus.base.domain.TbPeople;
 import com.bonus.screen.vo.PeoplePositionVo;
+import com.bonus.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
@@ -71,5 +72,12 @@ public interface TbPeopleMapper {
      * @return
      */
     int updateById(Long id);
+
+    /**
+     * 根据人员ID查询用户信息
+     * @param userId
+     * @return
+     */
+    SysUser getUserById(Long userId);
 }
 

bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbPeopleService.java

@@ -3,8 +3,7 @@ package com.bonus.base.service;
 import com.bonus.base.domain.TbPeople;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.screen.vo.PeoplePositionVo;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
+import com.bonus.system.api.domain.SysUser;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -78,4 +77,11 @@ public interface TbPeopleService {
     AjaxResult importTbPeople(MultipartFile file);
 
     List<PeoplePositionVo> queryPeoplePositionByProId(Integer proId);
+
+    /**
+     * 编辑时校验用户密码
+     * @param sysUser
+     * @return
+     */
+    AjaxResult sendPassWord(SysUser sysUser);
 }

bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java

@@ -14,6 +14,7 @@ import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.security.utils.SecurityUtils;
 import com.bonus.screen.vo.PeoplePositionVo;
+import com.bonus.system.api.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.ss.usermodel.*;
@@ -27,13 +28,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 人员管理(TbPeople)表服务实现类
@@ -357,6 +355,24 @@ public class TbPeopleServiceImpl implements TbPeopleService {
         return tbPeopleDao.queryPeoplePositionByProId(proId);
     }
 
+    /**
+     * 编辑时校验用户密码
+     * @param sysUse
+     * @return
+     */
+    @Override
+    public AjaxResult sendPassWord(SysUser sysUse) {
+        if (StringUtils.isBlank(sysUse.getPassword())) {
+            return AjaxResult.error(ExceptionEnum.TO_PARAM_NULL.getCode(), ExceptionEnum.TO_PARAM_NULL.getMsg());
+        }
+        Long userId = SecurityUtils.getUserId();
+        SysUser user = tbPeopleDao.getUserById(userId);
+        if (SecurityUtils.matchesPassword(sysUse.getPassword(), user.getPassword())) {
+            return AjaxResult.success("密码正确");
+        }
+        return AjaxResult.error("密码错误");
+    }
+
     /**
      * 读取Excel表格数据，做非空判断
      * @param sheet

bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml

@@ -272,7 +272,7 @@
     left join tb_bd_record tbr on tbdr.record_id = tbr.id
     left join sys_user su on tbr.audit_user = su.user_id
     where
-    1=1
+    tbr.audit_status = 1
     <if test="recordId != null">
       and tbdr.record_id = #{recordId}
     </if>

bonus-modules/bonus-base/src/main/resources/mapper/base/TbPeopleMapper.xml

@@ -151,5 +151,9 @@
         WHERE tp.del_flag = 0 AND project.id = #{proId}
         GROUP BY tp.id
     </select>
+
+    <select id="getUserById" resultType="com.bonus.system.api.domain.SysUser">
+        select user_id as userId, user_name as userName, password as password from sys_user where id = #{id}
+    </select>
 </mapper>