Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51

 src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java

@@ -93,7 +93,8 @@
        String id=getUserId();
        SysUser sysUser = sysUserService.getSysUser(id);
        // 不是管理员时
        if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
        if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
            this.approvalFlag=false;
        }else {
            this.approvalFlag=true;