|
|
@@ -208,8 +208,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
|
|
|
cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PUBLIC));
|
|
|
Map<String, Object> params = disposeParams(cli);
|
|
|
- return (Pagination<CustomerListOut>) findPage("selectPublicOrganizationCustomerList",
|
|
|
+ Pagination<CustomerListOut> page = (Pagination<CustomerListOut>) findPage("selectPublicOrganizationCustomerList",
|
|
|
"selectPublicOrganizationCustomerCount", params, pageNo, pageSize);
|
|
|
+ List<CustomerListOut> list = (List<CustomerListOut>) page.getList();
|
|
|
+ list.forEach(e -> {
|
|
|
+ if (e.getAid().equals(TokenManager.getAdminId())){
|
|
|
+ e.setMyUser(1);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return page;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -250,6 +257,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if (null != c) {
|
|
|
if (null != c.getAid())
|
|
|
c.setAdminName(adminMapper.selectNameByid(c.getAid()));
|
|
|
+ if (c.getAid().equals(TokenManager.getAdminId())){
|
|
|
+ c.setMyUser(1);
|
|
|
+ }
|
|
|
if (null != c.getShareType() && c.getShareType().equals("1"))
|
|
|
c.setAdminName("暂无");
|
|
|
if (null != c.getMid())
|