Sfoglia il codice sorgente

Merge branch 'release_toaliyun_real_20230228' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230228

release_toaliyun_real
lin 3 anni fa
parent
commit
0e4f76965c
2 ha cambiato i file con 7 aggiunte e 2 eliminazioni
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java Vedi File

@@ -418,6 +418,11 @@ public class WxProjectConfigController extends BaseController {
if(StringUtils.isBlank(userInfo.getTenantId())){ if(StringUtils.isBlank(userInfo.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
WxMall mall = wxMallService.getByTenantId(userInfo.getTenantId());
if(mall == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未找到对应的mall");
}
userInfo.updateTenantInfo(mall);
if(StringUtils.isBlank(userInfo.getUsername())){ if(StringUtils.isBlank(userInfo.getUsername())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java Vedi File

@@ -216,7 +216,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
userInfoService.saveOrUpdate(userInfo); userInfoService.saveOrUpdate(userInfo);
//创建角色 //创建角色
MallRole mallRole = new MallRole(); MallRole mallRole = new MallRole();
mallRole.setTenantId(userInfo.getTenantId());
mallRole.updateTenantInfo(userInfo);
mallRole.setName("系统管理员"); mallRole.setName("系统管理员");
mallRole.setAvailable("0"); mallRole.setAvailable("0");
mallRoleService.saveOrUpdate(mallRole); mallRoleService.saveOrUpdate(mallRole);
@@ -225,7 +225,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
List<MallPermission> list = mallPermissionService.getList(mallPermission); List<MallPermission> list = mallPermissionService.getList(mallPermission);
for(MallPermission m : list){ for(MallPermission m : list){
MallRolePermission mallRolePermission = new MallRolePermission(); MallRolePermission mallRolePermission = new MallRolePermission();
mallRolePermission.setTenantId(userInfo.getTenantId());
mallRolePermission.updateTenantInfo(userInfo);
mallRolePermission.setRoleId(mallRole.getId()); mallRolePermission.setRoleId(mallRole.getId());
mallRolePermission.setPermissionId(m.getId()); mallRolePermission.setPermissionId(m.getId());
mallRolePermissionService.saveOrUpdate(mallRolePermission); mallRolePermissionService.saveOrUpdate(mallRolePermission);


Caricamento…
Annulla
Salva