purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给部分表增加启用状态和排序字段，完善对应接口

Browse Source
This commit is contained in:
季圣华
2022-08-26 01:52:05 +08:00
parent 8906294c97
commit f8e542cbcc
21 changed files with 333 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java
View File

@@ -2,13 +2,11 @@ package com.jsh.erp.service.role;
import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.Role;
import com.jsh.erp.datasource.entities.RoleExample;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.RoleMapper;
import com.jsh.erp.datasource.mappers.RoleMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
@@ -64,7 +62,7 @@ public class RoleService {
public List<Role> allList()throws Exception {
RoleExample example = new RoleExample();
example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Role> list=null;
try{
list=roleMapper.selectByExample(example);
@@ -99,6 +97,7 @@ public class RoleService {
Role role = JSONObject.parseObject(obj.toJSONString(), Role.class);
int result=0;
try{
role.setEnabled(true);
result=roleMapper.insertSelective(role);
logService.insertLog("角色",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(role.getName()).toString(), request);
@@ -147,7 +146,7 @@ public class RoleService {
public List<Role> findUserRole()throws Exception{
RoleExample example = new RoleExample();
example.setOrderByClause("Id");
example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.createCriteria().andEnabledEqualTo(true).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Role> list=null;
try{
list=roleMapper.selectByExample(example);
@@ -187,4 +186,23 @@ public class RoleService {
public Role getRoleWithoutTenant(Long roleId) {
return roleMapperEx.getRoleWithoutTenant(roleId);
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchSetStatus(Boolean status, String ids)throws Exception {
logService.insertLog("角色",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ENABLED).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
List<Long> roleIds = StringUtil.strToLongList(ids);
Role role = new Role();
role.setEnabled(status);
RoleExample example = new RoleExample();
example.createCriteria().andIdIn(roleIds);
int result=0;
try{
result = roleMapper.updateByExampleSelective(role, example);
}catch(Exception e){
JshException.writeFail(logger, e);
}
return result;
}
}