diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java index bb3a0650..c852d879 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterialVo.java @@ -88,4 +88,18 @@ public class ErpMaterialVo extends ErpMaterial { public void setInstanceTypeName(String instanceTypeName) { this.instanceTypeName = instanceTypeName; } + + @Override + public String toString() { + return "ErpMaterialVo{" + + "applyUserName='" + applyUserName + '\'' + + ", taskId='" + taskId + '\'' + + ", taskName='" + taskName + '\'' + + ", doneTime=" + doneTime + + ", createUserName='" + createUserName + '\'' + + ", suspendState='" + suspendState + '\'' + + ", todoUserId='" + todoUserId + '\'' + + ", instanceTypeName='" + instanceTypeName + '\'' + + '}'; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 66a108b5..663b872b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -292,4 +293,12 @@ public class SysUserController extends BaseController //System.out.println(allUser); return Result.getSuccessResult(allUser); } + + @GetMapping("/selectUserSelList") + @ResponseBody + public AjaxResult selectUserSelList(@RequestParam(required = false,value = "userName")String userName) + { + List> userSelList = userService.selectUserSelList(userName); + return success(userSelList); + } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html index a81e4414..4e634606 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html @@ -23,6 +23,7 @@
+