Browse Source

feign远程接口修改

gao.qiang 1 year atrás
parent
commit
cb606b7d81

+ 1 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/api/SysUserApiService.java

@@ -74,7 +74,7 @@ public class SysUserApiService implements SysUserApi {
     @Override
     @RequestMapping("/getSysUserListByRoleId")
     public List<String> getSysUserListByRoleId(String roleId) {
-        List<com.ankaibei.workFlow.webadmin.upms.model.SysUser> sysUserListByRoleId = sysUserService.getSysUserListByRoleId(1L, null, null);
+        List<com.ankaibei.workFlow.webadmin.upms.model.SysUser> sysUserListByRoleId = sysUserService.getSysUserListByRoleId(Long.valueOf(roleId), null, null);
         List<String> userNameList=new ArrayList<>();
         if (!ObjectUtils.isEmpty(sysUserListByRoleId)){
             for (com.ankaibei.workFlow.webadmin.upms.model.SysUser sysUser : sysUserListByRoleId) {

+ 1 - 2
common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/impl/FlowApiServiceImpl.java

@@ -574,8 +574,7 @@ public class FlowApiServiceImpl implements FlowApiService {
         this.buildCandidateCondition(query, username);
         long totalCount = query.count();
         query.orderByTaskCreateTime().desc();
-        int firstResult = (listRuntimeTaskRequestVo.getPageNum() - 1) * listRuntimeTaskRequestVo.getPageSize();
-        List<Task> taskList = query.listPage(firstResult, listRuntimeTaskRequestVo.getPageSize());
+        List<Task> taskList = query.list();
         return new MyPageData<>(taskList, totalCount);
     }