|
@@ -100,6 +100,7 @@ public class AdminRoleLogic {
|
|
@Transactional
|
|
@Transactional
|
|
public void update(AdminRole adminRole) {
|
|
public void update(AdminRole adminRole) {
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
|
|
+ final AdminRole oldData = adminRoleService.getById(adminRole.getAdminRoleId());
|
|
if (adminUser.getType() == 1
|
|
if (adminUser.getType() == 1
|
|
&& Objects.nonNull(adminRole.getLevel())
|
|
&& Objects.nonNull(adminRole.getLevel())
|
|
&& adminRole.getLevel() != 0
|
|
&& adminRole.getLevel() != 0
|
|
@@ -117,6 +118,8 @@ public class AdminRoleLogic {
|
|
if (Objects.nonNull(adminRole.getType()) && adminRole.getType() == 0 && adminRole.getLevel() == 0) {
|
|
if (Objects.nonNull(adminRole.getType()) && adminRole.getType() == 0 && adminRole.getLevel() == 0) {
|
|
throw new RemoteServiceException("网点需要选级别");
|
|
throw new RemoteServiceException("网点需要选级别");
|
|
}
|
|
}
|
|
|
|
+ adminRole.setCompanyWechatId(oldData.getCompanyWechatId())
|
|
|
|
+ .setCompanyName(oldData.getCompanyName());
|
|
adminRoleService.updateById(adminRole);
|
|
adminRoleService.updateById(adminRole);
|
|
|
|
|
|
if (adminRole.getName() != null) {
|
|
if (adminRole.getName() != null) {
|