Commit ac462739 by qwmqiuwenmin

fix

parent 10e655d5
......@@ -38,6 +38,8 @@ public class DepartmentDTO implements Serializable {
private String wxEnterpriseId;
private Integer type;
private String storeCode;
private static final long serialVersionUID = 1L;
......@@ -176,6 +178,14 @@ public class DepartmentDTO implements Serializable {
public void setType(Integer type) {
this.type = type;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
......
......@@ -328,8 +328,17 @@ public class DepartmentContoller extends WebBaseController{
String wxEnterpriseId = login.getWxEnterpriseId();
Integer recycleFlag = 1;
Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyWord,storeFlag,recycleFlag);
List<DepartmentDTO> list = page.getResult();
for (DepartmentDTO departmentDTO : list) {
if(departmentDTO.getIsStore() != null && departmentDTO.getIsStore() == 1){
StoreDTO store = storeService.getStore(departmentDTO.getRelatedId());
if(store != null){
departmentDTO.setStoreCode(store.getStoreCode());
}
}
}
PageResult<DepartmentDTO> pageVo = new PageResult<>();
pageVo.setList(page.getResult());
pageVo.setList(list);
pageVo.setPageNum(page.getCurrentPage());
pageVo.setPages(page.getPages());
pageVo.setPageSize(page.getPageSize());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment