角色调整

src/main/java/com/minpay/huicai/system/action/RoleManageAction.java

@@ -845,9 +845,10 @@ public class RoleManageAction implements IMINAction {
 		criteria.andSttNotEqualTo(Constant.DEPT_STT_DEL);
 		if(!user.getBranchId().equals(Constant.DEFAULT_INSTITUTIONS)){
 			criteriab.andParentidEqualTo(user.getBranchId());
+			List<ImBranch> lsb = Service.lookup(IMINDataBaseService.class).selectByExample(ImBranchMapper.class, exampleb);
+			ls.addAll(lsb);
 		}
-		List<ImBranch> lsb = Service.lookup(IMINDataBaseService.class).selectByExample(ImBranchMapper.class, exampleb);
-		ls.addAll(lsb);
+
 		res.set(IMINBusinessConstant.F_QUERY_RESULT, ls);
 		return res;
 	}

src/main/webapp/admin/roleManage/roleAdd.html

@@ -110,11 +110,11 @@
         				break;
         			}
         		}
-        		if (isAllFlag) {
+        		/*if (isAllFlag) {
         			inputs[0].checked = true;
         		} else {
         			inputs[0].checked = false;
-        		}
+        		}*/
         	}
 			//处理全选框问题
 			var checkedAll = true;