lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录返回行政区划名称

master
徐杰盟 2024-05-29 16:49:04 +08:00
parent 7d08291ec5
commit 9cb2d96ccf
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/whdc/controller/AddressBookController.java
View File

@ -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));

2
src/main/java/com/whdc/service/IVersionsService.java
View File

@ -24,5 +24,5 @@ public interface IVersionsService extends IService<Versions> {
// 获取所有规则
List<Versions> find(Versions dto);
boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd);
boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd, Object reqData);
}

4
src/main/java/com/whdc/service/impl/VersionsServiceImpl.java
View File

@ -43,7 +43,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> 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<VersionsMapper, Versions> 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
);

2
src/main/resources/mapper/AddressBookMapper.xml
View File

@ -64,7 +64,7 @@
</select>
<select id="byId" resultType="com.whdc.model.vo.AddressBookVo">
<select id="getVoById" resultType="com.whdc.model.vo.AddressBookVo">
SELECT
AB.*,IF(O.NAME IS NULL,UD.NAME,O.NAME) ONAME,A.ADNM
FROM