|
|
@@ -49,7 +49,7 @@ import com.cloudcross.ssp.service.IUserLoginService;
|
|
|
|
|
|
@Controller
|
|
|
@RequestMapping("/operator/main/authority")
|
|
|
-public class AuthorityController1 extends SimpleController{
|
|
|
+public class AuthorityOperatorController extends SimpleController{
|
|
|
|
|
|
@Autowired
|
|
|
private FreemarkerTemplateProcessor templateProcessor;
|
|
|
@@ -79,12 +79,12 @@ public class AuthorityController1 extends SimpleController{
|
|
|
//当前登录用户
|
|
|
Account loginAccount = getLoginUser();
|
|
|
paramMap.put("loginAccount", loginAccount);
|
|
|
- int totalRow = accountService.countByParams(paramMap);
|
|
|
+ int totalRow = accountService.countByParamsOperator(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.findByParamsOperator(paramMap, pager);
|
|
|
//循环获取查询到账号的登录时间；保存到对象的creatTime字段中
|
|
|
for (int i = 0; i < accountList.size(); i++) {
|
|
|
UserLogin login = userLoginService.getById(new Integer(accountList.get(i).getId()).toString());
|
|
|
@@ -134,7 +134,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
t.setPassword(Md5Tool.getMd5(password));
|
|
|
t.setDescription(account.getDescription());
|
|
|
//还要保存对应的权限——这个地方要调用resourcesercice中的addAccountResource方法
|
|
|
- accountService.addAccount(t);
|
|
|
+ accountService.addAccountOperator(t);
|
|
|
if(authority!=null && !authority.equals("")){
|
|
|
List<Long> autList = new ArrayList<Long>();
|
|
|
String[] aut = authority.split(",");
|
|
|
@@ -151,7 +151,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
t.setPassword(Md5Tool.getMd5(password));
|
|
|
}
|
|
|
//还要保存对应权限的修改——同样也要调用addAccountResource方法
|
|
|
- accountService.editAccount(t);
|
|
|
+ accountService.editAccountOperator(t);
|
|
|
if(authority!=null && !authority.equals("")){
|
|
|
List<Long> autList = new ArrayList<Long>();
|
|
|
String[] aut = authority.split(",");
|
|
|
@@ -269,7 +269,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
if (StringUtils.isNotBlank(password)) {
|
|
|
t.setPassword(Md5Tool.getMd5(password));
|
|
|
}
|
|
|
- accountService.editAccount(t);
|
|
|
+ accountService.editAccountOperator(t);
|
|
|
|
|
|
return "/login";
|
|
|
}
|
|
|
@@ -302,7 +302,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
*/
|
|
|
Account loginAccount = getLoginUser();
|
|
|
paramMap.put("loginAccount", loginAccount);
|
|
|
- List<Account> accountList = accountService.findExcelAccounts(paramMap);
|
|
|
+ List<Account> accountList = accountService.findExcelAccountsOperator(paramMap);
|
|
|
for (int i = 0; i < accountList.size(); i++) {
|
|
|
UserLogin login = userLoginService.getById(new Integer(accountList.get(i).getId()).toString());
|
|
|
//查询到的用户可能从未登录过系统，所以这里要判断一下，避免空指针异常！
|
原志强