~chenjialiang/moral.git

			@@ -4,11 +4,13 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.moral.api.entity.*;
			import com.moral.api.mapper.*;
			import com.moral.api.pojo.redisBean.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 com.moral.util.TokenUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -21,6 +23,7 @@
			import javax.servlet.http.HttpServletRequest;
			import java.text.SimpleDateFormat;
			import java.util.*;
			import java.util.function.Predicate;

			/**
			* <p>
			@@ -54,8 +57,6 @@
			@Autowired(required = false)
			private ManageAccountRoleMapper manageAccountRoleMapper;

			@Autowired
			LogUtils logUtils;

			@Override
			public Map<String,Object> getAllWithPagingQuery(Map map) {
			@@ -78,6 +79,19 @@
			manageRoleMap.put("updateTime",updateTime);
			manageRoleMap.put("key",manageRole.getId());
			manageRolesList.add(manageRoleMap);
			}
			//除admin账号外 admin角色不可见
			AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
			List<ManageRole> roles = accountInfo.getRoles();
			if(!roles.get(0).getName().equals("admin")){
			manageRolesList.removeIf(new Predicate<Map<String, Object>>() {
			@Override
			public boolean test(Map<String, Object> map) {
			if(map.get("name").equals("admin"))
			return true;
			return false;
			}
			});
			}
			resultMap.put("manageRoles",manageRolesList);
			int totalNumber = manageRoleMapper.selectCount(wrapper);
			@@ -129,7 +143,7 @@
			//操作插入日志
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			String content = "添加角色:"+manageRole.getName()+";";
			logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
			LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			return resultMap;
			@@ -162,7 +176,7 @@
			content = content+"备注:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
			}
			}
			logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
			LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			}
			@@ -231,7 +245,7 @@
			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
			ManageRole manageRole1 = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
			String content = "删除角色:"+manageRole1.getName()+";";
			logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
			LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
			resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
			resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
			}