diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java index 72bfbd4..6686bf1 100644 --- a/src/main/java/com/whdc/controller/AddressBookController.java +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -141,7 +141,7 @@ public class AddressBookController { } // 添加日志 - versionsService.saveInfo(model, VersionsType.ADD,model.getAdcd()); + versionsService.saveInfo(model, VersionsType.ADD,model.getAdcd(),model); model.setId(null); boolean save = service.save(model); @@ -250,7 +250,7 @@ public class AddressBookController { if (StringUtils.isBlank(adcd)){ adcd = byId.getAdcd(); } - versionsService.saveInfo(model, VersionsType.UPDATE,adcd); + versionsService.saveInfo(model, VersionsType.UPDATE,adcd,model); boolean data = service.updateById(model); if (data) { String organization = model.getOrganization(); @@ -314,9 +314,12 @@ public class AddressBookController { switch (Objects.requireNonNull(Role.getByName(user.getRole()))) { case R000: case R001: - return ResultJson.error("权限不足"); - case R099: + case R099: { + if (Integer.parseInt(model.getRole()) > Integer.parseInt(user.getRole())){ + return ResultJson.error("权限不足"); + } break; + } default: return ResultJson.error("权限不足!!"); } @@ -341,7 +344,7 @@ public class AddressBookController { // } // // 添加日志 // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE_ROLE.getName())); - versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE,byId.getAdcd()); + versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE,byId.getAdcd(),model); // 只修改角色 @@ -393,7 +396,7 @@ public class AddressBookController { // } // // 添加日志 // versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.DEL.getName())); - versionsService.saveInfo(model, VersionsType.DEL,model.getAdcd()); + versionsService.saveInfo(model, VersionsType.DEL,model.getAdcd(),id); return ResultJson.ok(service.removeById(id)); diff --git a/src/main/java/com/whdc/service/IVersionsService.java b/src/main/java/com/whdc/service/IVersionsService.java index 4ed0585..90ca8c3 100644 --- a/src/main/java/com/whdc/service/IVersionsService.java +++ b/src/main/java/com/whdc/service/IVersionsService.java @@ -24,5 +24,5 @@ public interface IVersionsService extends IService { // 获取所有规则 List find(Versions dto); - boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd); + boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd, Object reqData); } \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java index f2c387f..72179be 100644 --- a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java @@ -43,7 +43,7 @@ public class VersionsServiceImpl extends ServiceImpl i } @Override - public boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd) { + public boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd,Object reqData) { Integer version = 0; @@ -63,7 +63,7 @@ public class VersionsServiceImpl extends ServiceImpl i // 添加日志 Versions entity = new Versions(null, - JSON.toJSONString(model), model.getId(), ++version, adcd,String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(), + JSON.toJSONString(reqData), model.getId(), ++version, adcd,String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(), null, null ); diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index 7752a5d..7aaebbf 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -64,7 +64,7 @@ - SELECT AB.*,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME,A.ADNM FROM