screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -4,14 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -156,10 +154,10 @@
            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
            String content = "修改了角色:"+manageRoleOld.getName()+";";
            for (Object key:map.keySet()) {
                if (key.toString().equals("name")){
                if (key.toString().equals("name")&&map.get(key)!=null){
                    content = content+"角色名:"+manageRoleOld.getName()+"->"+map.get(key)+";";
                }
                if (key.toString().equals("desc")){
                if (key.toString().equals("desc")&&map.get(key)!=null){
                    content = content+"备注:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
                }
            }
@@ -179,6 +177,7 @@
        QueryWrapper<ManageRole> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        wrapper.like("name",map.get("name"));
        wrapper.orderByDesc("create_time");
        com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
        List<ManageRole> manageRoles = resultpage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");