Merge remote-tracking branch 'origin/master'

石广澎

2024-01-02 48ef443170ee0cc12268bda0c686ffbd1d81671c

 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java

@@ -34,6 +34,7 @@
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
import com.consum.base.pojo.RolePageParam;
import com.consum.base.pojo.request.FinSysTenantUserParam;
import com.consum.base.pojo.response.DepartmentVO;
import com.consum.base.pojo.response.FinSysTenantUserVO;
@@ -54,6 +55,7 @@
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
@@ -847,4 +849,27 @@
        return ResponseValue.success(finSysTenantVO);
    }

    @GetMapping("/query/role")
    public ResponseValue pageList() {
        RolePageParam roleParam = CommonUtil.getObjFromReq(RolePageParam.class);
        RolePageParam param2 = new RolePageParam();
        CommonUtil.copyProperties(roleParam, param2);
        roleParam = param2;
        if (roleParam != null && roleParam.getOrgId() > 0L) {
            long orgId = 0L;
            if (!this.isSupervisor()) {
                orgId = this.getCurrentUser().getOrg_id();
            } else {
                orgId = roleParam.getOrgId();
            }

            FinSysTenantUser finSysTenantUser = this.getSysInfo();
            Integer dataScope = finSysTenantUser.getLv();
            GenericPager<S_role> pager = finSysTenantUserService.queryPageRoleList(orgId, roleParam.getStatus(),
                roleParam.getRoleName(), dataScope,roleParam.getPageNum(), roleParam.getPageSize());
            return ResponseValue.success(pager);
        } else {
            return ResponseValue.error("参数不能为空");
        }
    }
}