新增权限grid(网格)villageTowns(组)

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -339,12 +339,16 @@ public class Czrk extends BaseEntity{
     private String regionIdXjd;
     private String villageTownsIdXjd;
     private String villageIdXjd;
+    private String gridIdXjd;
+    private String villagerGroupIdXjd;
 
     private String provinceXjd;
     private String cityXjd;
     private String regionXjd;
     private String villageTownsXjd;
     private String villageXjd;
+    private String gridXjd;
+    private String villagerGroupXjd;
     @Excel(name = "居住详细地址")
     private String nowXjd;
 

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -135,6 +135,24 @@ public class CzrkUtils {
                                 break;
                             }
                         }
+                        else if ("grid".equals(roleKey)) {
+                            if (type.equals(Czrk.HJ)) {
+                                czrk.setGridId(areaId);
+                                break;
+                            } else {
+                                czrk.setGridIdXjd(areaId);
+                                break;
+                            }
+                        }
+                        else if ("villagerGroup".equals(roleKey)) {
+                            if (type.equals(Czrk.HJ)) {
+                                czrk.setVillagerGroupId(areaId);
+                                break;
+                            } else {
+                                czrk.setVillagerGroupIdXjd(areaId);
+                                break;
+                            }
+                        }
                     }
                 }
             }
@@ -362,7 +380,40 @@ public class CzrkUtils {
                                     }
                                 }
                             }
-                        } else if ("admin".equals(roleKey)) {
+                        } else if ("grid".equals(roleKey)) {
+                            String gridId = czrk.getGridId();
+                            if (StringUtils.isNotBlank(gridId) && gridId.equals(areaId)) {
+                                flag = false;
+                                break;
+                            } else {
+                                List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
+                                for (CzrkJzdz czrkJzdz : czrkJzdzList) {
+                                    String gridIdJzdz = czrkJzdz.getGridId();
+                                    if (StringUtils.isNotBlank(gridIdJzdz) && gridIdJzdz.equals(areaId)) {
+                                        flag = false;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        else if ("villagerGroup".equals(roleKey)) {
+                            String villagerGroupId = czrk.getVillagerGroupId();
+                            if (StringUtils.isNotBlank(villagerGroupId) && villagerGroupId.equals(areaId)) {
+                                flag = false;
+                                break;
+                            } else {
+                                List<CzrkJzdz> czrkJzdzList = czrk.getCzrkJzdzList();
+                                for (CzrkJzdz czrkJzdz : czrkJzdzList) {
+                                    String villagerGroupIdJzdz = czrkJzdz.getVillagerGroupId();
+                                    if (StringUtils.isNotBlank(villagerGroupIdJzdz) && villagerGroupIdJzdz.equals(areaId)) {
+                                        flag = false;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        else if ("admin".equals(roleKey)) {
                             flag = false;
                             break;
                         }