|
|
@@ -231,8 +231,8 @@ public class LoginAction implements IMINAction {
|
|
|
}
|
|
|
if(vmPersonRoleInfList.size() != 0){
|
|
|
res.set("isMerchants","1"); //是本机器的商户（是否管理员）
|
|
|
- res.set("role",role);
|
|
|
}
|
|
|
+ res.set("role",role);
|
|
|
//查询是否有所属机器是否有账户
|
|
|
VmAccountExample vmAccountExample = new VmAccountExample();
|
|
|
vmAccountExample.createCriteria().andEquipmentIdEqualTo(equNo).andUsridEqualTo(person.getId()).andChannelEqualTo(person.getChannel());
|
