From 0cc80c49603bb63b6ff348e5743cb5bb4801de7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 13:46:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
index 14ea118..4266fda 100644
--- a/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/web/ErpResourceController.java
@@ -43,16 +43,18 @@
List<ErpOrgListResponse> list = new ArrayList<>();
String[] ids = new String[]{"","001","002","003"};
String[] names = new String[]{"","缁勭粐1","缁勭粐2","缁勭粐3"};
- for(int i=1;i<=4;i++){
+ for(int i=1;i<4;i++){
ErpOrgListResponse r = new ErpOrgListResponse();
r.setParentOrgId(ids[i-1]);
+ r.setId(ids[i]);
r.setCreateDate(new Date());
- r.setCode(UUID.randomUUID().toString());
+ r.setCode(ids[i]);
r.setStatus(Constants.ZERO);
r.setName(names[i]);
list.add(r);
}
IPage<ErpOrgListResponse> pageInfo = new Page<>(1,10,3);
+ pageInfo.setTotal(3);
pageInfo.setRecords(list);
PageData<ErpOrgListResponse> r = PageData.from( pageInfo);
return ERPApiResponse.success(r);
@@ -64,18 +66,21 @@
String[] ids = new String[]{"","1001","1002","1003"};
String[] names = new String[]{"","浜哄憳1","浜哄憳2","浜哄憳3"};
String[] orgs = new String[]{"","001","002","003"};
- for(int i=1;i<=4;i++){
+ for(int i=1;i<4;i++){
ErpUserListResponse r = new ErpUserListResponse();
r.setOrgId(orgs[i]);
r.setId(ids[i]);
r.setName(names[i-1]);
r.setCode( ids[i]);
+ r.setIdNo("34112219880427042"+i);
+ r.setIsdeleted(Constants.ONE);
r.setName(names[i]);
r.setFaceImg("/20223402/"+r.getId()+".png");
list.add(r);
}
IPage<ErpUserListResponse> pageInfo = new Page<>(1,10,3);
pageInfo.setRecords(list);
+ pageInfo.setTotal(3);
PageData<ErpUserListResponse> r = PageData.from( pageInfo);
return ERPApiResponse.success(r);
}
--
Gitblit v1.9.3