|
|
@@ -83,12 +83,12 @@ public class AuthorityController extends SimpleController{
|
|
|
//当前登录用户，这个界面是要显示当前登陆用户所创建的所有账户，由于小号是没有权限看到这个界面的，所以不用区分是超管账号，还是小号！
|
|
|
Account loginAccount = getLoginUser();
|
|
|
paramMap.put("loginAccount", loginAccount);
|
|
|
- int totalRow = accountService.countByParams(paramMap);
|
|
|
+ int totalRow = accountService.countByParamsAdvertiser(paramMap);
|
|
|
System.out.println("黑喂狗"+totalRow);
|
|
|
Pager pager = new Pager();
|
|
|
pager.setPage(page);
|
|
|
pager.setTotalRow(totalRow);
|
|
|
- List<Account> accountList = accountService.findByParams(paramMap, pager);
|
|
|
+ List<Account> accountList = accountService.findByParamsAdvertiser(paramMap, pager);
|
|
|
//循环获取查询到账号的登录时间；保存到对象的creatTime字段中
|
|
|
for (int i = 0; i < accountList.size(); i++) {
|
|
|
UserLogin login = userLoginService.getById(new Integer(accountList.get(i).getId()).toString());
|
|
|
@@ -146,7 +146,7 @@ public class AuthorityController extends SimpleController{
|
|
|
if(t.getAdvertiserId()==null){
|
|
|
t.setAdvertiserId(new Long(0));
|
|
|
}else {
|
|
|
- accountService.addAccount(t);
|
|
|
+ accountService.addAccountAdvertiser(t);
|
|
|
Advertiser advertiser = advertiserService.findById(t.getAdvertiserId());
|
|
|
if (advertiser!=null) {
|
|
|
advertiser.setAdminId(new Long(t.getId()));
|
|
|
@@ -171,7 +171,7 @@ public class AuthorityController extends SimpleController{
|
|
|
t.setAdvertiserId(new Long(0));
|
|
|
}
|
|
|
//还要保存对应权限的修改——同样也要调用addAccountResource方法
|
|
|
- accountService.editAccount(t);
|
|
|
+ accountService.editAccountAdvertiser(t);
|
|
|
if (t.getAdvertiserId()!=null) {
|
|
|
Advertiser advertiser = advertiserService.findById(t.getAdvertiserId());
|
|
|
if (advertiser!=null) {
|
原志强