角色树报错问题

src/main/java/cn/hnthyy/thmz/controller/mz/ButtonController.java

@@ -212,10 +212,13 @@ public class ButtonController {
                 rm.setPId(button.getParentId() == null ? "0" : "p"+button.getParentId().toString());
                 if(roleButtons!=null && roleButtons.size()>0){
                     for (RoleButtonRelation roleButton : roleButtons) {
-                        if (button.getId() == roleButton.getButtonId()) {
+                        if (button.getId().equals(roleButton.getButtonId())) {
                             rm.setChecked(true);
                             RoleButtonVo roleButtonVo=RoleButtonVoMap.get(rm.getPId());
-                            roleButtonVo.setChecked(true);
+                            if(roleButtonVo != null){
+                                roleButtonVo.setChecked(true);
+                            }
+
                         }
                     }
                 }