src/main/java/com/moral/controller/AlarmUserController.java
@@ -39,13 +39,7 @@ return new ResultBean<Integer>(code); } @PostMapping("alarmUser/id") public ResultBean<Integer> deletealarmUserByLogic(@RequestBody AlarmUser alarmUser) { Integer result = alarmUserService.deletealarmUserByLogic(alarmUser); return new ResultBean<Integer>(result); } @PostMapping("alarmUsers/ids") @PostMapping("ids") public ResultBean<Integer> deleteAccountsByLogic(@RequestBody List<Integer> ids) { Integer result = alarmUserService.deletealarmUsersByLogic(ids); return new ResultBean<Integer>(result); src/main/java/com/moral/entity/AlarmUser.java
@@ -3,6 +3,7 @@ import java.util.Date; import javax.persistence.Id; import javax.persistence.Transient; import lombok.Data; @@ -116,4 +117,7 @@ * @mbg.generated Wed Dec 27 16:21:08 CST 2017 */ private String nickName; @Transient private Organization organization; } src/main/java/com/moral/service/AlarmUserService.java
@@ -12,8 +12,6 @@ Integer saveOrUpdatealarmUser(AlarmUser alarmUser); Integer deletealarmUserByLogic(AlarmUser alarmUser); Integer deletealarmUsersByLogic(List<Integer> ids); } src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -121,14 +121,16 @@ organizationIds.add(account.getOrganizationId()); } } example = new Example(Organization.class); example.or().andIn("id", organizationIds); List<Organization> organizations = organizationMapper.selectByExample(example); for (Account account : accounts) { for (Organization organization : organizations) { if (account.getOrganizationId() == organization.getId()) { account.setOrganization(organization); break; if(!ObjectUtils.isEmpty(organizationIds)){ example = new Example(Organization.class); example.or().andIn("id", organizationIds); List<Organization> organizations = organizationMapper.selectByExample(example); for (Account account : accounts) { for (Organization organization : organizations) { if (account.getOrganizationId() == organization.getId()) { account.setOrganization(organization); break; } } } } src/main/java/com/moral/service/impl/AlarmUserServiceImpl.java
@@ -1,8 +1,9 @@ package com.moral.service.impl; import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import javax.annotation.Resource; @@ -12,10 +13,10 @@ import com.github.pagehelper.PageHelper; import com.moral.common.bean.Constants; import com.moral.common.bean.PageBean; import com.moral.common.util.Crypto; import com.moral.common.util.ResourceUtil; import com.moral.entity.AlarmUser; import com.moral.entity.Organization; import com.moral.mapper.AlarmUserMapper; import com.moral.mapper.OrganizationMapper; import com.moral.service.AlarmUserService; import tk.mybatis.mapper.entity.Example; @@ -26,6 +27,9 @@ @Resource private AlarmUserMapper alarmUserMapper; @Resource private OrganizationMapper organizationMapper; @Override public PageBean<AlarmUser> getalarmUserList(Map<String, Object> parameters) { @@ -45,25 +49,36 @@ } PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize"))); List<AlarmUser> alarmUsers = alarmUserMapper.selectByExample(example); Set<Integer> organizationIds = new HashSet<Integer>(); for (AlarmUser alarmUser : alarmUsers) { if (!ObjectUtils.isEmpty(alarmUser.getOrganizationId())) { organizationIds.add(alarmUser.getOrganizationId()); } } if (!ObjectUtils.isEmpty(organizationIds)) { example = new Example(Organization.class); example.or().andIn("id", organizationIds); List<Organization> organizations = organizationMapper.selectByExample(example); for (AlarmUser alarmUser : alarmUsers) { for (Organization organization : organizations) { if (alarmUser.getOrganizationId() == organization.getId()) { alarmUser.setOrganization(organization); break; } } } } return new PageBean<AlarmUser>(alarmUsers); } @Override public Integer saveOrUpdatealarmUser(AlarmUser alarmUser) { if (ObjectUtils.isEmpty(alarmUser.getId())) { alarmUser.setIsDelete(Constants.IS_DELETE_FALSE); alarmUser.setCreateTime(new Date()); alarmUser.setPassword(Crypto.md5(ResourceUtil.getValue("password"))); return alarmUserMapper.insertSelective(alarmUser); } else { return alarmUserMapper.updateByPrimaryKeySelective(alarmUser); } } @Override public Integer deletealarmUserByLogic(AlarmUser alarmUser) { alarmUser.setIsDelete(Constants.IS_DELETE_TRUE); return alarmUserMapper.updateByPrimaryKeySelective(alarmUser); } @Override