|
@@ -175,7 +175,8 @@ public class RoleManageAction implements IMINAction {
|
|
|
ImRole role = Service.lookup(IMINDataBaseService.class).selectByPrimaryKey(ImRoleMapper.class, id);
|
|
ImRole role = Service.lookup(IMINDataBaseService.class).selectByPrimaryKey(ImRoleMapper.class, id);
|
|
|
role.setName(name);
|
|
role.setName(name);
|
|
|
role.setDesc(desc);
|
|
role.setDesc(desc);
|
|
|
- role.setIndexpage(roleMainPage);
|
|
|
|
|
|
|
+ //role.setIndexpage(roleMainPage);
|
|
|
|
|
+ role.setIndexpage("main.html");
|
|
|
Service.lookup(IMINDataBaseService.class).updateByPrimaryKey(ImRoleMapper.class, role);
|
|
Service.lookup(IMINDataBaseService.class).updateByPrimaryKey(ImRoleMapper.class, role);
|
|
|
|
|
|
|
|
Set<String> set = new HashSet<String>(Arrays.asList(itemid));
|
|
Set<String> set = new HashSet<String>(Arrays.asList(itemid));
|
|
@@ -296,9 +297,9 @@ public class RoleManageAction implements IMINAction {
|
|
|
if ("".equals(desc) || desc == null) {
|
|
if ("".equals(desc) || desc == null) {
|
|
|
throw new MINBusinessException("请输入角色描述!");
|
|
throw new MINBusinessException("请输入角色描述!");
|
|
|
}
|
|
}
|
|
|
- if ("".equals(roleMainPage) || roleMainPage == null) {
|
|
|
|
|
|
|
+ /*if ("".equals(roleMainPage) || roleMainPage == null) {
|
|
|
throw new MINBusinessException("请输入角色主页!");
|
|
throw new MINBusinessException("请输入角色主页!");
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
String[] itemid = itemidStr.split(",");
|
|
String[] itemid = itemidStr.split(",");
|
|
|
if (itemid.length == 0) {
|
|
if (itemid.length == 0) {
|
|
|
throw new MINBusinessException("至少选择一个菜单!");
|
|
throw new MINBusinessException("至少选择一个菜单!");
|
|
@@ -332,7 +333,8 @@ public class RoleManageAction implements IMINAction {
|
|
|
role.setBranchid(u.getBranchId());
|
|
role.setBranchid(u.getBranchId());
|
|
|
role.setAddbranch(u.getBranchId());
|
|
role.setAddbranch(u.getBranchId());
|
|
|
role.setAddtime(new DateTime().toDateTimeString());
|
|
role.setAddtime(new DateTime().toDateTimeString());
|
|
|
- role.setIndexpage(roleMainPage);
|
|
|
|
|
|
|
+ //role.setIndexpage(roleMainPage);
|
|
|
|
|
+ role.setIndexpage("main.html");
|
|
|
Service.lookup(IMINDataBaseService.class).insert(ImRoleMapper.class, role);
|
|
Service.lookup(IMINDataBaseService.class).insert(ImRoleMapper.class, role);
|
|
|
String[] itemIds = new String[itemid.length + 1];
|
|
String[] itemIds = new String[itemid.length + 1];
|
|
|
System.arraycopy(itemid, 0, itemIds, 0, itemid.length);
|
|
System.arraycopy(itemid, 0, itemIds, 0, itemid.length);
|