add

冻结、解冻用户

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/mapper/OAuth2Mapper.java

@@ -19,7 +19,10 @@ import org.mapstruct.factory.Mappers;
 @Mapper
 public interface OAuth2Mapper {
     OAuth2Mapper INSTANCE = Mappers.getMapper(OAuth2Mapper.class);
-
+    @Mappings(
+            @Mapping(source = "id",target = "userId")
+    )
+    OAuth2PswLoginInfoDTO  toPswLoginInfo(SysUserPO source);
     @Mappings(
             @Mapping(source = "id",target = "userId")
     )

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/psw/operator/LoginOAuth2PswUserOperator.java

@@ -181,7 +181,7 @@ public class LoginOAuth2PswUserOperator extends AbstractOAuth2PswUserOperator{
     public OAuth2PswLoginInfoDTO getUserLoginInfo() {
         String currentUserId = LoginUserStrategy.tr.getCurrentUserId();
         SysUserPO sysUser = sysUserRepository.selectById(currentUserId);
-        OAuth2PswLoginInfoDTO pswLoginInfo = OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUserService.selectSysUserById(currentUserId));
+        OAuth2PswLoginInfoDTO pswLoginInfo = OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUser);
         if(ObjectUtil.isNull(sysUser)){
             pswLoginInfo.setHavePassword(Boolean.FALSE);
         }else {

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/controller/SysTenantController.java

@@ -36,7 +36,7 @@ public class SysTenantController extends BaseController{
     private final ISysTenantService sysTenantService;
 
     @ApiOperationSupport(author = "lf",order = 1)
-    @ApiOperation(value="根据条件查询医院列表",notes = "权限： 无")
+    @ApiOperation(value="根据条件查询医院列表(超管)",notes = "权限： 无")
     @PostMapping("/query/page")
     @TenantIgnore
     public CommonResult<List<SysTenantCommonVO>> selectList(@RequestBody SysTenantQueryDTO query) {
@@ -46,7 +46,7 @@ public class SysTenantController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 2)
-    @ApiOperation(value = "根据id查询医院详情",notes = "权限： sys:tenant:query")
+    @ApiOperation(value = "根据id查询医院详情(超管)",notes = "权限： sys:tenant:query")
     @GetMapping("/detail/{id}")
     @SaCheckPermission("sys:tenant:query")
     public CommonResult<SysTenantCommonVO> findById(@PathVariable("id") String id){
@@ -54,7 +54,7 @@ public class SysTenantController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 3)
-    @ApiOperation(value="添加医院列表",notes = "权限： sys:tenant:add")
+    @ApiOperation(value="添加医院列表(超管)",notes = "权限： sys:tenant:add")
     @PostMapping("/add")
     @SaCheckPermission("sys:tenant:add")
     public CommonResult<Boolean> add(@RequestBody@Validated(Insert.class) SysTenantAddDTO source) {
@@ -62,7 +62,7 @@ public class SysTenantController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 4)
-    @ApiOperation(value="通过主键id编辑医院列表",notes = "权限： sys:tenant:edit")
+    @ApiOperation(value="通过主键id编辑医院列表(超管)",notes = "权限： sys:tenant:edit")
     @PostMapping("/edit")
     @SaCheckPermission("sys:tenant:edit")
     @OperateLog

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/controller/SysTenantPackageController.java

@@ -57,13 +57,20 @@ public class SysTenantPackageController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 1)
-    @ApiOperation(value="根据条件查询租户套餐",notes = "权限：无")
+    @ApiOperation(value="根据条件查询租户套餐(分页)",notes = "权限：无")
     @PostMapping("/query/page")
     public TableDataInfo<SysTenantPackageDTO> selectPage(@RequestBody SysTenantPackageQueryDTO query) {
         startPage();
         return getDataTable(sysTenantPackageService.selectSysTenantPackageList(query));
     }
 
+    @ApiOperationSupport(author = "lf",order = 1)
+    @ApiOperation(value="根据条件查询租户套餐(不分页)",notes = "权限：无")
+    @PostMapping("/query/list")
+    public CommonResult<List<SysTenantPackageDTO>> selectList(@RequestBody SysTenantPackageQueryDTO query) {
+        return CommonResult.success(sysTenantPackageService.selectSysTenantPackageList(query));
+    }
+
     @ApiOperationSupport(author = "lf",order = 2)
     @ApiOperation(value = "根据id查询租户套餐",notes = "权限： sys:tenantPackage:query")
     @GetMapping("/detail/{id}")