Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

he wei

2022-09-02 eaafd0d3d54bced10be18ce4de692ac86787f2d9

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/pojo/DocUser.java

@@ -69,8 +69,6 @@
    @ApiModelProperty(value = "人脸信息")
    private DocFace dface;

    @ApiModelProperty(value = "下载权限")
    private Integer dloadFlag;

    public DocUser(Long id, String name) {
        this.id = id;

 src/main/java/com/whyc/service/DocUserService.java

@@ -69,7 +69,6 @@
        wrapper.set("depart_id",docUser.getDepartId());
        wrapper.set("face_id",faceId);
        wrapper.set("role_id",docUser.getRoleId());
        wrapper.set("dload_flag",docUser.getDloadFlag());
        wrapper.eq("id",docUser.getId());
        int bl=mapper.update(null,wrapper);
        return new Response().set(1,bl>0);

 src/main/java/com/whyc/service/GroupService.java

@@ -1,5 +1,6 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.whyc.dto.PermitGroupDto;
import com.whyc.dto.Response;
@@ -33,6 +34,13 @@
    }
    //添加权限组
    public Response addGroup(String groupName) {
        //查看权限组名是否存在
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("group_name",groupName);
        List list=mapper.selectList(wrapper);
        if(list!=null&&list.size()>0){
            return new Response().set(1,false,"权限组存在");
        }else{
        //查询最大的权限组id
        int groupIdMax=mapper.selectGroupIdMax();
        Group group=new Group();
@@ -41,6 +49,7 @@
        int flag=mapper.insert(group);
        return new Response().set(1,flag>0,"返回");
    }
    }
    //删除权限组
    @Transactional
    public Response delGroup(String groupId) {

 src/main/java/com/whyc/service/PermitService.java

@@ -8,6 +8,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -19,7 +20,13 @@
    //登录后根据用户名查询该用户的权限
    public List getPermitsByUname() {
        DocUser docUser= ActionUtil.getUser();
        List<Permit> list=mapper.getPermitsByUname(docUser.getName());
        List<Permit> list=new ArrayList<Permit>();
        if(docUser.getName().equals("sys_admin")){
            list=mapper.selectList(null);
        }else{
            list=mapper.getPermitsByUname(docUser.getName());
        }

        return list;
    }
}