Browse Source

bug修改

24282 2 years ago
parent
commit
9663f599f8

+ 1 - 4
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/RoleTenantController.java

@@ -93,10 +93,7 @@ public class RoleTenantController extends BaseController {
         }
         }
         role.setUpdateBy(getUsername());
         role.setUpdateBy(getUsername());
 
 
-        int num = roleService.updateRole(role);
-        if (num == 0) {
-            throw new ServiceException("修改角色'" + role.getRoleName() + "'失败,请联系管理员");
-        }
+        roleService.updateRoleStatus(role);
 
 
         // 更新缓存用户权限
         // 更新缓存用户权限
         LoginUser loginUser = getLoginUser();
         LoginUser loginUser = getLoginUser();

+ 1 - 0
hx-tenant/src/main/java/com/fjhx/tenant/service/tenant/impl/TenantInfoServiceImpl.java

@@ -136,6 +136,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         sysDept.setDeptName(tenantInfoDto.getEnterpriseName());
         sysDept.setDeptName(tenantInfoDto.getEnterpriseName());
         sysDept.setOrderNum(1);
         sysDept.setOrderNum(1);
         sysDept.setStatus("0");
         sysDept.setStatus("0");
+        sysDept.setType(0);
         sysDept.setTenantId(tenantInfoDto.getTenantId());
         sysDept.setTenantId(tenantInfoDto.getTenantId());
         sysDept.setCreateBy(SecurityUtils.getUsername());
         sysDept.setCreateBy(SecurityUtils.getUsername());
         sysDept.setCreateTime(new Date());
         sysDept.setCreateTime(new Date());