fix

zhongzheng-admin-business/src/main/java/com/zhongzheng/controller/covenant/BsCovenantController.java

@@ -196,8 +196,8 @@ public class BsCovenantController extends BaseController {
     @Log(title = "企业协议" , businessType = BusinessType.DELETE)
     @PostMapping("/updateCheckStatus")
     public AjaxResult updateCheckStatus(@RequestBody NoCheckInfo noCheckInfo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iBsCovenantService.updateCheckStatus(noCheckInfo,loginUser) ? 1 : 0);
+        ClientBsLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return toAjax(iBsCovenantService.updateCheckStatus(noCheckInfo,loginUser.getUser().getUserId()) ? 1 : 0);
     }
     /**
      * 删除企业协议
@@ -206,8 +206,8 @@ public class BsCovenantController extends BaseController {
     @Log(title = "企业协议" , businessType = BusinessType.DELETE)
     @PostMapping("/updateStopCheck")
     public AjaxResult updateStopCheck(@RequestBody NoCheckInfo noCheckInfo) {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iBsCovenantService.updateStopCheck(noCheckInfo,loginUser) ? 1 : 0);
+        ClientBsLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return toAjax(iBsCovenantService.updateStopCheck(noCheckInfo,loginUser.getUser().getUserId()) ? 1 : 0);
     }
     /**
      * 删除企业协议

zhongzheng-admin/src/main/java/com/zhongzheng/controller/covenant/BsCovenantController.java

@@ -212,7 +212,7 @@ public class BsCovenantController extends BaseController {
     @PostMapping("/updateCheckStatus")
     public AjaxResult updateCheckStatus(@RequestBody NoCheckInfo noCheckInfo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iBsCovenantService.updateCheckStatus(noCheckInfo,loginUser) ? 1 : 0);
+        return toAjax(iBsCovenantService.updateCheckStatus(noCheckInfo,loginUser.getUser().getUserId()) ? 1 : 0);
     }
     /**
      * 删除企业协议
@@ -222,7 +222,7 @@ public class BsCovenantController extends BaseController {
     @PostMapping("/updateStopCheck")
     public AjaxResult updateStopCheck(@RequestBody NoCheckInfo noCheckInfo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        return toAjax(iBsCovenantService.updateStopCheck(noCheckInfo,loginUser) ? 1 : 0);
+        return toAjax(iBsCovenantService.updateStopCheck(noCheckInfo,loginUser.getUser().getUserId()) ? 1 : 0);
     }
     /**
      * 删除企业协议

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/IBsCovenantService.java

@@ -84,11 +84,11 @@ public interface IBsCovenantService extends IService<BsCovenant> {
 	/**
 	 * 协议审核
 	 */
-	boolean updateCheckStatus(NoCheckInfo noCheckInfo,LoginUser loginUser);
+	boolean updateCheckStatus(NoCheckInfo noCheckInfo,Long userId);
 	/**
 	 * 终止审核
 	 */
-	boolean updateStopCheck(NoCheckInfo noCheckInfo,LoginUser loginUser);
+	boolean updateStopCheck(NoCheckInfo noCheckInfo,Long userId);
 	/**
 	 * 协议上传
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bs/covenant/service/impl/BsCovenantServiceImpl.java

@@ -621,8 +621,8 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     }
 
     @Override
-    public boolean updateCheckStatus(NoCheckInfo noCheckInfo,LoginUser loginUser) {
-        List<SysMenu> listSysMenuByTenant = iSysMenuService.selectMenuList(loginUser.getUser().getUserId());
+    public boolean updateCheckStatus(NoCheckInfo noCheckInfo,Long userId) {
+        List<SysMenu> listSysMenuByTenant = iSysMenuService.selectMenuList(userId);
         List<String> menuNameList = listSysMenuByTenant.stream().map(SysMenu::getMenuName).collect(Collectors.toList());
         //判断当前用户是否存在改路由
         if (menuNameList.contains("协议审核")) {
@@ -637,7 +637,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
             if (noCheckInfo.getStatus() == 4) {
                 CovenantCheckRecordAddBo covenantCheckRecord = new CovenantCheckRecordAddBo();
                 covenantCheckRecord.setCovenantId(noCheckInfo.getCovenantId());
-                covenantCheckRecord.setUserId(loginUser.getUser().getUserId());
+                covenantCheckRecord.setUserId(userId);
                 covenantCheckRecord.setCheckRecord(noCheckInfo.getCheckInfo());
                 covenantCheckRecord.setCreateTime(DateUtils.getNowTime());
                 covenantCheckRecord.setUpdateTime(DateUtils.getNowTime());
@@ -653,8 +653,8 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
     }
 
     @Override
-    public boolean updateStopCheck(NoCheckInfo noCheckInfo,LoginUser loginUser) {
-        List<SysMenu> listSysMenuByTenant = iSysMenuService.selectMenuList(loginUser.getUser().getUserId());
+    public boolean updateStopCheck(NoCheckInfo noCheckInfo,Long userId) {
+        List<SysMenu> listSysMenuByTenant = iSysMenuService.selectMenuList(userId);
         List<String> menuNameList = listSysMenuByTenant.stream().map(SysMenu::getMenuName).collect(Collectors.toList());
         if (menuNameList.contains("协议审核")) {
             BsCovenantVo bsCovenantVo = queryById(noCheckInfo.getCovenantId());
@@ -667,7 +667,7 @@ public class BsCovenantServiceImpl extends ServiceImpl<BsCovenantMapper, BsCoven
             if (noCheckInfo.getStatus()==3){
                 CovenantCheckRecordAddBo covenantCheckRecord = new CovenantCheckRecordAddBo();
                 covenantCheckRecord.setCovenantId(noCheckInfo.getCovenantId());
-                covenantCheckRecord.setUserId(loginUser.getUser().getUserId());
+                covenantCheckRecord.setUserId(userId);
                 covenantCheckRecord.setCheckRecord(noCheckInfo.getCheckInfo());
                 covenantCheckRecord.setCreateTime(DateUtils.getNowTime());
                 covenantCheckRecord.setUpdateTime(DateUtils.getNowTime());