问题处理

hx-flow/src/main/java/com/fjhx/flow/service/flow/FlowExampleService.java

@@ -9,7 +9,6 @@ import com.fjhx.flow.entity.flow.po.FlowInfo;
 import com.fjhx.flow.entity.flow.vo.ApprovalRecordVo;
 import com.fjhx.flow.entity.flow.vo.FlowExampleVo;
 import com.ruoyi.common.core.domain.BaseIdPo;
-import com.ruoyi.common.core.domain.FlowIdPo;
 import com.ruoyi.common.core.service.BaseService;
 
 import java.util.Collections;
@@ -80,16 +79,6 @@ public interface FlowExampleService extends BaseService<FlowExample> {
     default <T extends BaseIdPo> void setFlowId(List<T> list, BiConsumer<T, Long> setFun) {
         setFlowId(list, BaseIdPo::getId, setFun);
     }
-    /**
-     * 赋值流程id
-     */
-    default <T extends BaseIdPo> void setFlowId(List<T> list, int type ,BiConsumer<T, Long> setFun) {
-        if(type==1){
-            setFlowId(list, BaseIdPo::getId, setFun);
-        }else{
-            setFlowId(list, BaseIdPo::getCId, setFun);
-        }
-    }
 
     /**
      * 赋值流程id

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -69,6 +69,14 @@ public class UserTenantController extends BaseController {
             user.setCompanyId(companyId);
         }
 
+        return listAll(user);
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);