1、角色添加页面加载树不显示修复

2、审核页面修改

backend/src/main/java/com/jiayue/ssi/config/WebSecurityConfig.java

@@ -2,6 +2,7 @@ package com.jiayue.ssi.config;
 
 import com.jiayue.ssi.filter.*;
 import com.jiayue.ssi.handler.*;
+import com.jiayue.ssi.service.SysUserService;
 import com.jiayue.ssi.service.impl.UserServiceImpl;
 import com.jiayue.ssi.util.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     CustomLogoutSuccessHandler customLogoutSuccessHandler;
     @Autowired
     JwtTokenUtil jwtTokenUtil;
+    @Autowired
+    SysUserService sysUserService;
 //    @Autowired
 //    XssEscapeFilter xssEscapeFilter;
 //    @Autowired
@@ -88,7 +91,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         httpSecurity.addFilterBefore(new SqlFilter(), LogoutFilter.class);
         httpSecurity.addFilterBefore(new VerifyCodeFilter(), LogoutFilter.class);
         httpSecurity.addFilterBefore(new MailCodeFilter(), LogoutFilter.class);
-        httpSecurity.addFilterBefore(new JwtAuthenticationTokenFilter(userServiceImpl, jwtTokenUtil), LogoutFilter.class);
+        httpSecurity.addFilterBefore(new JwtAuthenticationTokenFilter(userServiceImpl, jwtTokenUtil, sysUserService), LogoutFilter.class);
         httpSecurity.headers().frameOptions().disable();
         httpSecurity.headers().httpStrictTransportSecurity().includeSubDomains(true).preload(true).maxAgeInSeconds(31536000);
         httpSecurity

backend/src/main/java/com/jiayue/ssi/controller/SysApproveController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 审批接口
+ * 审核接口
  *
  * @author xsl
  * @since 2023/03/13
@@ -85,19 +85,19 @@ public class SysApproveController {
             Page<SysApprove> result = sysApproveService.page(new Page<>(cp, ps), wrapper);
             List<SysApprove> records = result.getRecords();
             //遍历对象数组的方法
-//            records.forEach(
-//                    record -> {
-//                        if (record.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
-//                            SysUser sysUser = JSONUtil.toBean(record.getParameterContent(),SysUser.class);
-//                            if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
-//                                record.setParameterContent("{账号："+sysUser.getUsername()+"}");
-//                            }
-//                        }
-//                    }
-//            );
+            records.forEach(
+                    record -> {
+                        if (record.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
+                            SysUser sysUser = JSONUtil.toBean(record.getParameterContent(),SysUser.class);
+                            if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
+                                record.setParameterContent("{账号："+sysUser.getUsername()+"}");
+                            }
+                        }
+                    }
+            );
             return ResponseVO.success(result);
         } catch (Exception e) {
-            throw new CustomException("获取所有审批异常", e);
+            throw new CustomException("获取所有审核异常", e);
         }
     }
 
@@ -105,28 +105,15 @@ public class SysApproveController {
      * 审批结果提交
      */
     @PostMapping(value = "/submitApprove")
-    @OperateLog(title = "审批管理", businessType = BusinessType.UPDATE, auditType = AuditType.SYS)
+    @OperateLog(title = "审核管理", businessType = BusinessType.UPDATE, auditType = AuditType.SYS)
     @PreAuthorize("@ss.hasPermi('approveManager:approve:submitApprove')")
     @PreventReplay
     public ResponseVO submitApprove(@RequestBody SysApprove sysApprove) throws CustomException {
         try {
-            sysApprove.setApproveStatus(ApproveStatusEnum.YSP.getCode() + "");
-            boolean bo = sysApproveService.updateById(sysApprove);
-            if (bo) {
-                // 执行业务操作
-                boolean bizBo = sysApproveService.executeBizSql(sysApprove);
-                if (bizBo) {
-                    return ResponseVO.success("审批提交成功");
-                } else {
-                    log.error("审批提交失败");
-                    return ResponseVO.fail("审批提交失败");
-                }
-            } else {
-                log.error("审批提交失败");
-                return ResponseVO.fail("审批提交失败");
-            }
+            sysApproveService.submitApprove(sysApprove);
+            return ResponseVO.success("审核提交成功");
         } catch (Exception e) {
-            throw new CustomException("审批提交异常", e);
+            throw new CustomException("审核提交异常", e);
         }
     }
 }

backend/src/main/java/com/jiayue/ssi/entity/SysApprove.java

@@ -1,11 +1,15 @@
 package com.jiayue.ssi.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 审批表
  *
@@ -47,5 +51,4 @@ public class SysApprove extends BaseEntity{
      * 主键ID号
      */
     private String masterId;
-
 }

backend/src/main/java/com/jiayue/ssi/service/SysApproveService.java

@@ -1,21 +1,22 @@
 package com.jiayue.ssi.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.entity.SysApprove;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 
 /**
- * 审批服务类
+ * 审核服务类
  * @author xsl
  * @date 2023/2/16
  */
 public interface SysApproveService extends IService<SysApprove> {
     /**
-     * 执行业务sql
+     * 审核提交
      * @param sysApprove
      * @return
      */
-    boolean executeBizSql(SysApprove sysApprove);
+    void submitApprove(SysApprove sysApprove) throws CustomException;
 }

backend/src/main/java/com/jiayue/ssi/service/impl/SysApproveServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.backenum.ApproveResultEnum;
 import com.jiayue.ssi.backenum.ApproveStatusEnum;
 import com.jiayue.ssi.constant.ApproveConstants;
+import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.entity.SysApprove;
 import com.jiayue.ssi.entity.SysUser;
 import com.jiayue.ssi.mapper.SysApproveMapper;
@@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
-* 审批实现类
+* 审核实现类
 *
 * @author xsl
 * @since 2023/03/29
@@ -30,26 +30,29 @@ public class SysApproveServiceImpl extends ServiceImpl<SysApproveMapper, SysAppr
     SysUserMapper sysUserMapper;
 
     /**
-     * 执行业务sql
+     * 审核提交
      * @param sysApprove
      * @return
      */
     @Override
     @Transactional(propagation= Propagation.REQUIRED, rollbackFor = Exception.class)
-    public boolean executeBizSql(SysApprove sysApprove) {
-        // 通过的状态执行sql
-        if (sysApprove.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
-            SysUser sysUser = JSONUtil.toBean(sysApprove.getParameterContent(),SysUser.class);
-            if (sysApprove.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
-                // 用户管理删除操作
-                LambdaUpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<SysUser>().lambda();
-                updateWrapper.eq(SysUser::getId, sysUser.getId()).set(SysUser::getDelFlag, 1);
-                int count = sysUserMapper.update(new SysUser(), updateWrapper);
-                if (count > 0) {
-                    return true;
+    public void submitApprove(SysApprove sysApprove) throws CustomException {
+        SysApprove newsysApprove = this.getById(sysApprove.getId());
+        newsysApprove.setApproveStatus(ApproveStatusEnum.YSP.getCode() + "");
+        newsysApprove.setApproveResult(sysApprove.getApproveResult());
+        this.updateById(newsysApprove);
+
+        if ("0".equals(newsysApprove.getApproveResult())){
+            // 审核通过，执行业务操作。
+            if (newsysApprove.getModuleName().equals(ApproveConstants.MODULE_NAME_USER)){
+                SysUser sysUser = JSONUtil.toBean(newsysApprove.getParameterContent(),SysUser.class);
+                if (newsysApprove.getOperation().equals(String.valueOf(ApproveOperaterEnum.DELETE.getCode()))){
+                    // 用户管理删除操作
+                    LambdaUpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<SysUser>().lambda();
+                    updateWrapper.eq(SysUser::getId, sysUser.getId()).set(SysUser::getDelFlag, 1);
+                    sysUserMapper.update(new SysUser(), updateWrapper);
                 }
             }
         }
-        return false;
     }
 }

ui/src/views/examineManager/sysApprove/index.vue

@@ -4,10 +4,10 @@
       <!--用户数据-->
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-          <el-form-item label="审批状态" prop="approveStatus">
+          <el-form-item label="审核状态" prop="approveStatus">
             <el-select
               v-model="queryParams.approveStatus"
-              placeholder="请选择审批状态"
+              placeholder="请选择审核状态"
               clearable
               style="width: 240px"
             >
@@ -19,10 +19,10 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="审批结果" prop="approveResult">
+          <el-form-item label="审核结果" prop="approveResult">
             <el-select
               v-model="queryParams.approveResult"
-              placeholder="请选择审批结果"
+              placeholder="请选择审核结果"
               clearable
               style="width: 240px"
             >
@@ -56,8 +56,8 @@
           >
             <vxe-table-column field="moduleName" title="模块名称"/>
             <vxe-table-column field="operation" title="执行操作" :formatter="operationFormat"/>
-            <vxe-table-column field="approveStatus" title="审批状态" :formatter="approveStatusFormat"/>
-            <vxe-table-column field="approveResult" title="审批结果" :formatter="approveResultFormat"/>
+            <vxe-table-column field="approveStatus" title="审核状态" :formatter="approveStatusFormat"/>
+            <vxe-table-column field="approveResult" title="审核结果" :formatter="approveResultFormat"/>
             <vxe-table-column field="parameterContent" title="操作内容"/>
             <vxe-table-column title="操作" width="320">
               <template slot-scope="scope" v-if="scope.row.approveStatus == 0">
@@ -106,8 +106,8 @@ export default {
   data() {
     return {
       approveStatusOptions: [
-        {value: '0', label: '待审批'},
-        {value: '1', label: '已审批'}
+        {value: '0', label: '待审核'},
+        {value: '1', label: '已审核'}
       ],
       approveResultOptions: [
         {value: '0', label: '通过'},
@@ -241,7 +241,7 @@ export default {
       } else {
         tips = '【未通过】'
       }
-      this.$confirm('确认审批结果' + tips + '?', '提示', {
+      this.$confirm('确认审核结果' + tips + '?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -265,7 +265,7 @@ export default {
       row.lk = lk
       await this.$axios.post('/sysApproveController/submitApprove', row).then((res) => {
         if (res.code == 0) {
-          this.$message.success('审批成功')
+          this.$message.success('审核成功')
           this.getList();
         }
         if (res.code == 1) {

ui/src/views/sysManager/roleManager/index.vue

@@ -396,8 +396,20 @@ export default {
       return belongTo
     },
     /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      this.$axios.get('/sysMenuController/treeselect').then((res) => {
+    async getMenuTreeselect() {
+      let sysTime
+      let lk
+      await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
+        sysTime = res.data.sysTime
+        lk = res.data.lk
+      }).catch((error) => {
+      })
+      var searchParams = {
+        sysTime: sysTime,
+        lk: lk
+      }
+      await this.$axios.get('/sysMenuController/treeselect',
+        {params: searchParams}).then((res) => {
         this.menuOptions = res.data
       }).catch((error) => {
         this.loading = false