From a73c63037e6a5276ce6442873afc627e8cb2c9b0 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 18 Oct 2019 14:46:42 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/RoleServiceImpl.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/RoleServiceImpl.java b/src/main/java/com/moral/service/impl/RoleServiceImpl.java
index e1879f3..9cf3716 100644
--- a/src/main/java/com/moral/service/impl/RoleServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/RoleServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -8,10 +9,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.util.ExampleUtil;
-import com.moral.common.util.MyBatisBaseMapUtil;
import com.moral.entity.Role;
import com.moral.mapper.RoleMapper;
import com.moral.service.RoleService;
@@ -28,27 +29,20 @@
RoleMapper roleMapper;
@Override
- public PageBean<Role> queryByPageBean(PageBean pageBean) {
- return MyBatisBaseMapUtil.queryPage(roleMapper, pageBean, ENTITY_CLASS);
- }
-
- @Override
@Transactional
public void addOrModify(Role role) {
try {
role.setUpdateTime(new Date());
role.setUpdateUser(role.getUpdateUser());
if (role.getId() != null) {
- roleMapper.updateByPrimaryKeySelective(role);
+ roleMapper.updateByPrimaryKey(role);
} else {
Role roleQuery = new Role();
roleQuery.setRoleCode(role.getRoleCode());
roleQuery.setIsDelete(Constants.IS_DELETE_FALSE);
Role roleResult = roleMapper.selectOne(roleQuery);
- if (roleResult != null) {
- role.setId(roleResult.getId());
- roleMapper.updateByPrimaryKeySelective(role);
- } else {
+ if (roleResult == null) {
+ role.setChannelId(role.getChannelId());
role.setIsDelete(Constants.IS_DELETE_FALSE);
role.setCreateTime(new Date());
role.setCreateUser(role.getCreateUser());
@@ -61,16 +55,6 @@
}
@Override
- @Transactional
- public int deleteByIds(List<Integer> ids) {
- Role role = new Role();
- role.setIsDelete(Constants.IS_DELETE_TRUE);
- Example example = new Example(ENTITY_CLASS);
- example.or().andIn("id", ids);
- return roleMapper.updateByExampleSelective(role, example);
- }
-
- @Override
public int countByExample(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
TkMybatisUtils.addDeletesToExample(example);
@@ -78,9 +62,30 @@
}
@Override
- public List<Role> getRoleList(String roleName) {
- List<Role> roleList = roleMapper.getRoleList(roleName);
+ public List<Role> getRoleListByName(String roleName) {
+ List<Role> roleList = roleMapper.getRoleListByName(roleName);
return roleList;
}
+ @Override
+ public PageBean getRoleList(PageBean pageBean) {
+ Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
+ TkMybatisUtils.addDeletesToExample(example);
+ if (pageBean.getPageSize() > 0) {
+ PageHelper.startPage(pageBean.getPageIndex(), pageBean.getPageSize());
+ }
+ List<Role> roleList = roleMapper.getRoleList(example);
+ return new PageBean(roleList);
+ }
+
+ @Override
+ @Transactional
+ public void deleteByIds(Integer... ids) {
+ Role role = new Role();
+ role.setIsDelete(Constants.IS_DELETE_TRUE);
+ Example example = new Example(ENTITY_CLASS);
+ example.or().andIn("id", Arrays.asList(ids));
+ roleMapper.updateByExampleSelective(role, example);
+ }
+
}
--
Gitblit v1.8.0