diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 05b505594b..9de4b0d167 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -76,23 +76,23 @@ public enum RequirePermissionEnum {
     /**
      * 基层治理-议题管理
      */
-    WORK_GRASSROOTS_ISSUE_VOTINGLIST("work_grassroots_issue_voting_list","表决中","表决中议题列表查询"),
-    WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST("work_grassroots_issue_shifted_project_list", "已转项目列表查询","已转项目议题列表查询"),
-    WORK_GRASSROOTS_ISSUE_CLOSED_LIST("work_grassroots_issue_closed_list","已关闭","已关闭议题列表查询"),
-    WORK_GRASSROOTS_ISSUE_DETAIL("work_grassroots_issue_detail", "议题详情","议题详情界面所有的api添加此校验"),
-    WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "转项目","转项目（选择处理部门api也需要添加此校验）"),
-    WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","关闭议题","关闭议题"),
+    WORK_GRASSROOTS_ISSUE_VOTINGLIST("work_grassroots_issue_voting_list","基层治理:议题管理:表决中","表决中议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_SHIFTED_PROJECT_LIST("work_grassroots_issue_shifted_project_list", "基层治理:议题管理:已转项目列表查询","已转项目议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_CLOSED_LIST("work_grassroots_issue_closed_list","基层治理:议题管理:已关闭","已关闭议题列表查询"),
+    WORK_GRASSROOTS_ISSUE_DETAIL("work_grassroots_issue_detail", "基层治理:议题管理:议题详情","议题详情界面所有的api添加此校验"),
+    WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "基层治理:议题管理:转项目","转项目（选择处理部门api也需要添加此校验）"),
+    WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","基层治理:议题管理:关闭议题","关闭议题"),
 
     /**
      * 工作-项目跟踪
      */
-    WORK_PROJECT_TRACE_PENDING_LIST("work_project_trace_pending_list","待处理","待处理的项目，列表查询"),
-    WORK_PROJECT_TRACE_CREATED_LIST("work_project_trace_created_list","我发起","我发起的项目，列表查询"),
-    WORK_PROJECT_TRACE_INVOLVED_LIST("work_project_trace_involved_list","我参与","我参与的项目，列表查询"),
-    WORK_PROJECT_TRACE_DETAIL("work_project_trace_detail","项目详情","项目详情界面所有的api添加此校验"),
-    WORK_PROJECT_TRACE_CLOSE("work_project_trace_close","结案","结案"),
-    WORK_PROJECT_TRACE_TRANSFER("work_project_trace_transfer","转其他部门","转其他部门（选择处理部门api也需要添加此校验）"),
-    WORK_PROJECT_TRACE_RETURN("work_project_trace_return","退回","退回"),
+    WORK_PROJECT_TRACE_PENDING_LIST("work_project_trace_pending_list","项目跟踪:待处理","待处理的项目，列表查询"),
+    WORK_PROJECT_TRACE_CREATED_LIST("work_project_trace_created_list","项目跟踪:我发起","我发起的项目，列表查询"),
+    WORK_PROJECT_TRACE_INVOLVED_LIST("work_project_trace_involved_list","项目跟踪:我参与","我参与的项目，列表查询"),
+    WORK_PROJECT_TRACE_DETAIL("work_project_trace_detail","项目跟踪:项目详情","项目详情界面所有的api添加此校验"),
+    WORK_PROJECT_TRACE_CLOSE("work_project_trace_close","项目跟踪:结案","结案"),
+    WORK_PROJECT_TRACE_TRANSFER("work_project_trace_transfer","项目跟踪:转其他部门","转其他部门（选择处理部门api也需要添加此校验）"),
+    WORK_PROJECT_TRACE_RETURN("work_project_trace_return","项目跟踪:退回","退回"),
 
     /**
      * 党务工作-党建声音
@@ -106,7 +106,17 @@ public enum RequirePermissionEnum {
     WORK_PARTY_VOICE_PUBLISH("work_party_voice_publish", "党建声音:创建文章", ""),
     WORK_PARTY_VOICE_EDIT("work_party_voice_edit", "党建声音:重新编辑", ""),
     WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", ""),
-    WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录","");
+    WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录",""),
+
+    /**
+     * 基层治理-支部管理
+     */
+    WORK_GRASSROOTS_PARTY_BRANCH_ADD("work_grassroots_party_branch_add","基层治理:支部管理:添加党支部","支部管理-添加党支部"),
+    WORK_GRASSROOTS_PARTY_BRANCH_EDIT("work_grassroots_party_branch_edit","基层治理:支部管理:编辑党支部","支部管理-编辑党支部信息"),
+    WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","基层治理:支部管理:删除党支部","支部管理-删除党支部"),
+    WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","基层治理:支部管理:添加党员","支部管理-添加党员"),
+    WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","基层治理:支部管理:编辑党员","支部管理-编辑党员"),
+    WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","基层治理:支部管理:删除党员","支部管理-删除党员");
 
 
     private String key;
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 04aabbf38f..e12787cc3b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -37,7 +37,13 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 	NOT_DEL_GRID(8106,"该网格存在工作人员，不允许删除"),
+
 	ORG_IS_NOT_NULL(8107,"党组织关系不能为空"),
+	CANNOT_DELETE_PARTY_BRANCH(8108,"当前支部存在党员，不允许删除"),
+	IDCARDNO_ALREADY_EXITS(8109,"系统已存在相同身份证号码，请重新输入"),
+	IDCARDNO_ERROR(8110,"身份证号格式错误，请重新输入"),
+	CANNOT_DELETE_PARTY_MEMBER(8111,"该用户已注册党员，不允许删除"),
+
 
     CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
 	NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),
@@ -89,7 +95,7 @@ public enum EpmetErrorCode {
 				return epmetErrorCodeEnum.getMsg();
 			}
 		}
-		return null;
+		return EpmetErrorCode.SERVER_ERROR.getMsg();
 	}
 
 	public int getCode(){
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
new file mode 100644
index 0000000000..2aa3e2c964
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java
@@ -0,0 +1,212 @@
+package com.epmet.commons.tools.validator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Hashtable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.*;
+
+/**
+ * 身份证号校验
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 9:59
+ */
+public class IdCardNoValidatorUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(IdCardNoValidatorUtils.class);
+
+    /**
+     * 身份证验证
+     *
+     * @param idCardNo
+     * @return 校验信息，correct为成功，失败会返回对应的失败原因
+     */
+    public static boolean checkIsIdCardNo(String idCardNo) {
+        String[] wf = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
+        String[] checkCode = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"};
+        String iDCardNo = "";
+        try {
+            //判断号码的长度 15位或18位
+            if (idCardNo.length() != 15 && idCardNo.length() != 18) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证号码长度应该为15位或18位"));
+                return false;
+            }
+            if (idCardNo.length() == 18) {
+                String lastStr = idCardNo.substring(idCardNo.length() - 1);
+                if (!Character.isDigit(lastStr.charAt(0))) {
+                    if (Character.isLowerCase(lastStr.charAt(0))) {
+                        logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "18身份证号最后一位字母需要大写"));
+                        return false;
+                    }
+                } else {
+                    logger.info(String.format("身份证号%s最后一位为数字"));
+                }
+            }
+            if (idCardNo.length() == 18) {
+                iDCardNo = idCardNo.substring(0, 17);
+            } else if (idCardNo.length() == 15) {
+                iDCardNo = idCardNo.substring(0, 6) + "19" + idCardNo.substring(6, 15);
+            }
+            if (isStrNum(iDCardNo) == false) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证15位号码都应为数字;18位号码除最后一位外,都应为数字"));
+                return false;
+            }
+            //判断出生年月
+            String strYear = iDCardNo.substring(6, 10);// 年份
+            String strMonth = iDCardNo.substring(10, 12);// 月份
+            String strDay = iDCardNo.substring(12, 14);// 月份
+            if (isStrDate(strYear + "-" + strMonth + "-" + strDay) == false) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日无效"));
+                return false;
+            }
+            GregorianCalendar gc = new GregorianCalendar();
+            SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+            if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证生日不在有效范围"));
+                return false;
+            }
+            if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证月份无效"));
+                return false;
+            }
+            if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证日期无效"));
+                return false;
+            }
+            //判断地区码
+            Hashtable h = GetAreaCode();
+            if (h.get(iDCardNo.substring(0, 2)) == null) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证地区编码错误"));
+                return false;
+            }
+            //判断最后一位
+            int theLastOne = 0;
+            for (int i = 0; i < 17; i++) {
+                theLastOne = theLastOne + Integer.parseInt(String.valueOf(iDCardNo.charAt(i))) * Integer.parseInt(checkCode[i]);
+            }
+            int modValue = theLastOne % 11;
+            String strVerifyCode = wf[modValue];
+            iDCardNo = iDCardNo + strVerifyCode;
+
+            if (idCardNo.length() == 18 && !iDCardNo.equals(idCardNo)) {
+                logger.error(String.format("校验身份证号:%s错误:%s", idCardNo, "身份证无效，不是合法的身份证号码"));
+                return false;
+            }
+
+        } catch (Exception e) {
+            logger.error(String.format("校验身份证号方法异常"));
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    /**
+     * 地区代码
+     *
+     * @return Hashtable
+     */
+    private static Hashtable GetAreaCode() {
+        Hashtable<String, String> hashtable = new Hashtable<String, String>();
+        hashtable.put("11", "北京");
+        hashtable.put("12", "天津");
+        hashtable.put("13", "河北");
+        hashtable.put("14", "山西");
+        hashtable.put("15", "内蒙古");
+        hashtable.put("21", "辽宁");
+        hashtable.put("22", "吉林");
+        hashtable.put("23", "黑龙江");
+        hashtable.put("31", "上海");
+        hashtable.put("32", "江苏");
+        hashtable.put("33", "浙江");
+        hashtable.put("34", "安徽");
+        hashtable.put("35", "福建");
+        hashtable.put("36", "江西");
+        hashtable.put("37", "山东");
+        hashtable.put("41", "河南");
+        hashtable.put("42", "湖北");
+        hashtable.put("43", "湖南");
+        hashtable.put("44", "广东");
+        hashtable.put("45", "广西");
+        hashtable.put("46", "海南");
+        hashtable.put("50", "重庆");
+        hashtable.put("51", "四川");
+        hashtable.put("52", "贵州");
+        hashtable.put("53", "云南");
+        hashtable.put("54", "西藏");
+        hashtable.put("61", "陕西");
+        hashtable.put("62", "甘肃");
+        hashtable.put("63", "青海");
+        hashtable.put("64", "宁夏");
+        hashtable.put("65", "新疆");
+        hashtable.put("71", "台湾");
+        hashtable.put("81", "香港");
+        hashtable.put("82", "澳门");
+        hashtable.put("91", "国外");
+        return hashtable;
+    }
+
+    /**
+     * 判断字符串是否为数字
+     *
+     * @param str
+     * @return
+     */
+    private static boolean isStrNum(String str) {
+        Pattern pattern = compile("[0-9]*");
+        Matcher isNum = pattern.matcher(str);
+        if (isNum.matches()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 判断字符串是否为日期格式
+     *
+     * @param strDate
+     * @return
+     */
+    public static boolean isStrDate(String strDate) {
+        Pattern pattern = compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
+        Matcher m = pattern.matcher(strDate);
+        if (m.matches()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    //根据身份证号判断性别 1男2女0未知
+    public static String getGender(String idCard) {
+        String gender = "0";
+        if (!IdCardNoValidatorUtils.checkIsIdCardNo(idCard)) {
+            return gender;
+        }
+        if (idCard.length() == 18) {
+            if (Integer.parseInt(idCard.substring(16).substring(0, 1)) % 2 == 0) {
+                gender = "2";
+            } else {
+                gender = "1";
+            }
+        } else if (idCard.length() == 15) {
+            String usex = idCard.substring(14, 15);
+            if (Integer.parseInt(usex) % 2 == 0) {
+                gender = "2";
+            } else {
+                gender = "1";
+            }
+        }
+        return gender;
+    }
+
+}
+
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
new file mode 100644
index 0000000000..86dad3a7a3
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 权限配置-操作默认范围form dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesFormDTO {
+
+    public interface ListOpeDefaultScopesGroup {}
+    public interface SaveOpeDefaultScopesGroup {}
+
+    @NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+    private String roleKey;
+
+    @NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+    private String operationKey;
+
+    private List<String> scopeKeys;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java
new file mode 100644
index 0000000000..cb6f196403
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 角色默认操作权限列表from DTO
+ */
+@Data
+public class AccessConfigRoleDefaultOpesFormDTO {
+
+    @NotBlank(message = "角色Key不能为空")
+    private String roleKey;
+
+    private List<String> operationKeys;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java
new file mode 100644
index 0000000000..53023bd459
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java
@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * 权限配置-操作的默认范围result dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesResultDTO {
+    private String scopeKey;
+    private String scopeName;
+    private String scopeIndex;
+    private String operationKey;
+    private String roleKey;
+    private Boolean assigned;
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java
new file mode 100644
index 0000000000..4c1f593712
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OperationScopeDefaultResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+@Data
+public class OperationScopeDefaultResultDTO {
+
+    private String roleKey;
+
+    /**
+     * 操作key
+     */
+    private String operationKey;
+
+    /**
+     * 范围key
+     */
+    private String scopeKey;
+
+}
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
index a757844fe3..6961dad6ca 100755
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java
@@ -18,7 +18,6 @@
 package com.epmet.dto.result;
 
 import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
@@ -48,4 +47,14 @@ public class RoleOperationDefaultResultDTO implements Serializable {
      */
 	private String operationKey;
 
+    /**
+     * 操作名称
+     */
+	private String operationName;
+
+    /**
+     * 是否已经具有该操作权限
+     */
+    private Boolean assigned;
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
index c419c8a257..b4ca57f24b 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+//@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "http://localhost:8099")
 @FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallback = GovAccessFeignClientFallBack.class)
 public interface GovAccessFeignClient {
 
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
index abaec853c1..8780612264 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.29
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.32
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 417d37bd68..93a1bd00f9 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.29</version>
+    <version>0.3.32</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>
@@ -120,7 +120,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
                 <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
index 49374b9084..ec11eaa26f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java
@@ -2,12 +2,13 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.AccessConfigOpesFormDTO;
-import com.epmet.dto.form.AccessConfigOptionsFormDTO;
-import com.epmet.dto.form.AccessConfigSaveConfigDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.AccessConfigOpesResultDTO;
 import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.service.AccessConfigService;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +23,18 @@ public class AccessConfigController {
     private AccessConfigService accessConfigService;
 
     /**
-     * 列出角色的操作列表(及该操作的scope范围)
+     * 根据roleKey查询角色默认操作列表(包括assigned字段，标识该角色是否已经具有该操作权限)
+     * @param roleKey
+     * @return
+     */
+    @PostMapping("roledefaultops/{roleKey}")
+    public Result listRoleDefaultOps(@PathVariable("roleKey") String roleKey) {
+        List<RoleOperationDefaultResultDTO> defaultOps = accessConfigService.listRoleDefaultOpsByRoleKey(roleKey);
+        return new Result().ok(defaultOps);
+    }
+
+    /**
+     * 根据角色ID列出角色的操作列表(及该操作的scope范围)
      * @param roleId
      * @return
      */
@@ -68,4 +80,40 @@ public class AccessConfigController {
         return new Result();
     }
 
+    /**
+     * 保存角色默认操作权限列表
+     * @param form
+     * @return
+     */
+    @PostMapping("roledefaultopes/save")
+    public Result saveRoleDefaultOperations(@RequestBody AccessConfigRoleDefaultOpesFormDTO form) {
+        ValidatorUtils.validateEntity(form);
+        accessConfigService.saveRoleDefaultOperations(form.getRoleKey(), form.getOperationKeys());
+        return new Result();
+    }
+
+    /**
+     * 查询操作的默认范围列表
+     * @param form
+     * @return
+     */
+    @PostMapping("opedefaultscopes/list")
+    public Result listOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+        ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.ListOpeDefaultScopesGroup.class);
+        List<AccessConfigOpeDefaultScopesResultDTO> scopes = accessConfigService.listOpeDefaultScopes4Role(form.getRoleKey(), form.getOperationKey());
+        return new Result().ok(scopes);
+    }
+
+    /**
+     * 保存操作的默认范围配置
+     * @param form
+     * @return
+     */
+    @PostMapping("opedefaultscopes/save")
+    public Result saveOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+        ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.SaveOpeDefaultScopesGroup.class);
+        accessConfigService.saveOpeDefaultScopes(form.getRoleKey(), form.getOperationKey(), form.getScopeKeys());
+        return new Result();
+    }
+
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
new file mode 100755
index 0000000000..2c9a049e83
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
+import com.epmet.dto.result.OperationScopeDefaultResultDTO;
+import com.epmet.entity.OperationScopeDefaultEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 默认操作范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Mapper
+public interface OperationScopeDefaultDao extends BaseDao<OperationScopeDefaultEntity> {
+    List<OperationScopeDefaultEntity> listAllValid();
+
+    /**
+     * 根据角色key和操作key查询默认操作权限列表
+     * @param roleKey
+     * @return
+     */
+    List<OperationScopeDefaultResultDTO> listDefaultOpeScopes(@Param("roleKey") String roleKey);
+
+    /**
+     * 查询操作的默认范围
+     * @param roleKey
+     * @param operationKey
+     * @return
+     */
+    List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Config(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
+
+    List<OperationScopeDefaultEntity> listOpeDefaultScopesByRoleAndOpeKey(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
+
+    int delete(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey,
+            @Param("scopeKey") String scopeKey);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
index 820c23bba6..19ccbf901e 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.entity.RoleOperationDefaultEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -47,4 +48,10 @@ public interface RoleOperationDefaultDao extends BaseDao<RoleOperationDefaultEnt
      * @return
      */
      List<RoleOperationDefaultResultDTO> listByRoleKey(@Param("roleKey") String roleKey);
+
+    List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(@Param("roleKey") String roleKey);
+
+    int deleteByRoleKeyAndOpeKey(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
new file mode 100755
index 0000000000..6ec89eb12b
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperationScopeDefaultEntity.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 默认操作范围表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("operation_scope_default")
+public class OperationScopeDefaultEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	private String roleKey;
+
+    /**
+     * 操作key
+     */
+	private String operationKey;
+
+    /**
+     * 范围key
+     */
+	private String scopeKey;
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
index b19c7e08e0..8ea82b13b9 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java
@@ -18,12 +18,13 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("role_operation_default")
 public class RoleOperationDefaultEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
index e6dfec5878..3fc28b675f 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java
@@ -1,7 +1,10 @@
 package com.epmet.service;
 
+import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.AccessConfigOpesResultDTO;
 import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 
 import java.util.List;
 import java.util.Set;
@@ -14,4 +17,12 @@ public interface AccessConfigService {
     AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey);
 
     void saveConfig(String roleId, String operationKey, Set<String> scopeKeys);
+
+    List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(String roleKey);
+
+    void saveRoleDefaultOperations(String roleKey, List<String> operationKeys);
+
+    List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Role(String roleKey, String operationKey);
+
+    void saveOpeDefaultScopes(String roleKey, String operationKey, List<String> scopeKeys);
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
index 78594a96fd..7b635cedf0 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java
@@ -4,6 +4,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.dao.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.OperationScopeDefaultEntity;
+import com.epmet.entity.RoleOperationDefaultEntity;
 import com.epmet.entity.RoleOperationEntity;
 import com.epmet.entity.RoleScopeEntity;
 import com.epmet.redis.RoleOpeScopeRedis;
@@ -30,9 +32,15 @@ public class AccessConfigServiceImpl implements AccessConfigService {
     @Autowired
     private RoleOperationDao roleOperationDao;
 
+    @Autowired
+    private RoleOperationDefaultDao roleOperationDefaultDao;
+
     @Autowired
     private RoleScopeDao roleScopeDao;
 
+    @Autowired
+    private OperationScopeDefaultDao operationScopeDefaultDao;
+
     @Override
     public List<AccessConfigOpesResultDTO> listOpesByRole(String roleId) {
         return roleOperationDao.listOpesForAccessConfig(roleId);
@@ -118,4 +126,74 @@ public class AccessConfigServiceImpl implements AccessConfigService {
         // 清空redis缓存
         roleOpeScopeRedis.delRoleAllOpeScopes(roleId);
     }
+
+    @Override
+    public List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(String roleKey) {
+        return roleOperationDefaultDao.listRoleDefaultOpsByRoleKey(roleKey);
+    }
+
+    /**
+     *
+     * @param roleKey
+     * @param operationKeys
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveRoleDefaultOperations(String roleKey, List<String> operationKeys) {
+
+        List<RoleOperationDefaultResultDTO> opesExists = roleOperationDefaultDao.listByRoleKey(roleKey);
+        Set<String> opeKeysExists = opesExists.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet());
+
+        // 过滤出删掉的
+        Set<String> deletedOpes = opeKeysExists.stream().filter(oke -> !operationKeys.contains(oke)).collect(Collectors.toSet());
+        // 过滤出新增的
+        Set<String> newOpes = operationKeys.stream().filter(okn -> !opeKeysExists.contains(okn)).collect(Collectors.toSet());
+
+        for (String deletedOpe : deletedOpes) {
+            roleOperationDefaultDao.deleteByRoleKeyAndOpeKey(roleKey, deletedOpe);
+        }
+
+        for (String newOpe : newOpes) {
+            RoleOperationDefaultEntity entity = new RoleOperationDefaultEntity();
+            entity.setRoleKey(roleKey);
+            entity.setOperationKey(newOpe);
+            roleOperationDefaultDao.insert(entity);
+        }
+    }
+
+    /**
+     * 查询默认的
+     * @param roleKey
+     * @param operationKey
+     * @return
+     */
+    @Override
+    public List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Role(String roleKey, String operationKey) {
+        return operationScopeDefaultDao.listOpeDefaultScopes4Config(roleKey, operationKey);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveOpeDefaultScopes(String roleKey, String operationKey, List<String> submitScopeKeys) {
+        List<OperationScopeDefaultEntity > exists = operationScopeDefaultDao.listOpeDefaultScopesByRoleAndOpeKey(roleKey, operationKey);
+
+        Set<String> existsScopeKeys = exists.stream().map(ope -> ope.getScopeKey()).collect(Collectors.toSet());
+
+        // 删掉的
+        Set<String> deleteds = existsScopeKeys.stream().filter(esk -> !submitScopeKeys.contains(esk)).collect(Collectors.toSet());
+        // 新增的
+        Set<String> addeds = submitScopeKeys.stream().filter(ssk -> !existsScopeKeys.contains(ssk)).collect(Collectors.toSet());
+
+        for (String scopeKey : deleteds) {
+            operationScopeDefaultDao.delete(roleKey, operationKey, scopeKey);
+        }
+
+        for (String scopeKey : addeds) {
+            OperationScopeDefaultEntity entity = new OperationScopeDefaultEntity();
+            entity.setOperationKey(operationKey);
+            entity.setRoleKey(roleKey);
+            entity.setScopeKey(scopeKey);
+            operationScopeDefaultDao.insert(entity);
+        }
+    }
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
index a1320faf7b..28943e74b8 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java
@@ -23,13 +23,18 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.OperationScopeDefaultDao;
 import com.epmet.dao.RoleOperationDao;
 import com.epmet.dao.RoleOperationDefaultDao;
+import com.epmet.dao.RoleScopeDao;
 import com.epmet.dto.RoleOperationDTO;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.dto.result.OperationScopeDefaultResultDTO;
 import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.dto.result.RoleOperationResultDTO;
+import com.epmet.entity.OperationScopeDefaultEntity;
 import com.epmet.entity.RoleOperationEntity;
+import com.epmet.entity.RoleScopeEntity;
 import com.epmet.service.RoleOperationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 角色能进行那些操作
@@ -56,6 +59,12 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
     @Autowired
     private RoleOperationDao roleOperationDao;
 
+    @Autowired
+    private OperationScopeDefaultDao operationScopeDefaultDao;
+
+    @Autowired
+    private RoleScopeDao roleScopeDao;
+
     @Override
     public PageData<RoleOperationDTO> page(Map<String, Object> params) {
         IPage<RoleOperationEntity> page = baseDao.selectPage(
@@ -116,7 +125,6 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
     @Override
     @Transactional
     public void initDefaultOperationsForRoles(List<InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO> roles) {
-        //roleOperationDefaultDao.listAllValid();
         for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) {
             String roleId = role.getRoleId();
             String roleKey = role.getRoleKey();
@@ -124,6 +132,7 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
             if (!CollectionUtils.isEmpty(defaultOperations)) {
                 // 有的角色并没有配置默认的操作权限，应该忽略
                 initDefaultOperationsForRole(roleId, defaultOperations);
+                initDefaultOperationScopesForRole(roleId, roleKey, defaultOperations);
             }
         }
     }
@@ -142,4 +151,68 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
         }
     }
 
+    /**
+     * 为角色初始化操作范围
+     * 传入的map为所有操作的默认操作范围，但是具体要为该角色初始化哪一些操作，是由operations参数决定的，并不是map中所有操作都会被初始化给该role
+     * @param roleId 角色ID
+     * @param operations 该角色可以做的操作列表
+     */
+    public void initDefaultOperationScopesForRole(String roleId, String roleKey, List<RoleOperationDefaultResultDTO> operations) {
+        HashMap<String, Set<String>> opeScopeMap = listDefaultOpeScopesMap(roleKey);
+        for (RoleOperationDefaultResultDTO operation : operations) {
+            // 该角色，该操作的操作范围列表
+            Set<String> scopeKeys4ThisOpe = opeScopeMap.get(operation.getOperationKey());
+            if (!CollectionUtils.isEmpty(scopeKeys4ThisOpe)) {
+                for (String scopeKey : scopeKeys4ThisOpe) {
+                    RoleScopeEntity roleScopeEntity = new RoleScopeEntity();
+                    roleScopeEntity.setOperationKey(operation.getOperationKey());
+                    roleScopeEntity.setRoleId(roleId);
+                    roleScopeEntity.setScopeKey(scopeKey);
+                    roleScopeDao.insert(roleScopeEntity);
+                }
+            }
+        }
+    }
+
+    private HashMap<String, Set<String>> listDefaultOpeScopesMap(String roleKey) {
+        List<OperationScopeDefaultResultDTO> defaultScopes = operationScopeDefaultDao.listDefaultOpeScopes(roleKey);
+        return convertScopeDefaultDto2Map(defaultScopes);
+    }
+
+    /**
+     * 将默认范围entity转换为map
+     * @param entities
+     * @return
+     */
+    private HashMap<String, Set<String>> convertScopeDefaultEntity2Map(List<OperationScopeDefaultEntity> entities) {
+        HashMap<String, Set<String>> map = new HashMap<>();
+        for (OperationScopeDefaultEntity entity : entities) {
+            Set<String> scopes = map.get(entity.getOperationKey());
+            if (scopes == null) {
+                scopes = new HashSet<>();
+                map.put(entity.getOperationKey(), scopes);
+            }
+            scopes.add(entity.getScopeKey());
+        }
+        return map;
+    }
+
+    /**
+     * 将默认范围dto转换为map
+     * @param dtos
+     * @return
+     */
+    private HashMap<String, Set<String>> convertScopeDefaultDto2Map(List<OperationScopeDefaultResultDTO> dtos) {
+        HashMap<String, Set<String>> map = new HashMap<>();
+        for (OperationScopeDefaultResultDTO dto : dtos) {
+            Set<String> scopes = map.get(dto.getOperationKey());
+            if (scopes == null) {
+                scopes = new HashSet<>();
+                map.put(dto.getOperationKey(), scopes);
+            }
+            scopes.add(dto.getScopeKey());
+        }
+        return map;
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
index c1772b7c54..0591776c96 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
@@ -32,6 +32,16 @@
 
     <!--查询角色所有operation及其范围-->
     <select id="listAllRoleOperationScopesByRoleId" resultType="com.epmet.dto.result.RoleOpeScopeResultDTO">
+        SELECT rs.ROLE_ID, rs.OPERATION_KEY, rs.SCOPE_KEY, os.SCOPE_INDEX, os.SERIES, os.SORT
+        FROM role_scope rs
+                 INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY)
+        WHERE rs.DEL_FLAG = 0
+          AND rs.ROLE_ID = #{roleId}
+        ORDER BY rs.OPERATION_KEY ASC
+    </select>
+
+    <!--查询角色所有operation及其范围,old方式-->
+    <!--<select id="listAllRoleOperationScopesByRoleId" resultType="com.epmet.dto.result.RoleOpeScopeResultDTO">
         SELECT t.*, os.SCOPE_INDEX, os.SERIES, os.SORT
         FROM (
                  SELECT ope.ROLE_ID,
@@ -48,7 +58,7 @@
                  ORDER BY OPERATION_KEY ASC
              ) t
                  INNER JOIN operation_scope os ON (t.SCOPE_KEY = os.SCOPE_KEY)
-    </select>
+    </select>-->
 
     <select id="getDefaultScopeKeyForOperation" resultType="java.lang.String">
         SELECT def.SCOPE_KEY
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
new file mode 100755
index 0000000000..da0ae9597d
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.OperationScopeDefaultDao">
+
+    <resultMap type="com.epmet.entity.OperationScopeDefaultEntity" id="operationScopeDefaultMap">
+        <result property="id" column="ID"/>
+        <result property="roleKey" column="ROLE_KEY"/>
+        <result property="operationKey" column="OPERATION_KEY"/>
+        <result property="scopeKey" column="SCOPE_KEY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <delete id="delete">
+        DELETE
+        FROM operation_scope_default
+        WHERE ROLE_KEY = #{roleKey}
+          AND OPERATION_KEY = #{operationKey}
+          AND SCOPE_KEY = #{scopeKey}
+    </delete>
+
+    <select id="listAllValid" resultType="com.epmet.entity.OperationScopeDefaultEntity">
+        SELECT *
+        FROM operation_scope_default WHERE DEL_FLAG=0
+    </select>
+
+    <!--根据角色key和操作key查询默认操作权限列表-->
+    <select id="listDefaultOpeScopes" resultType="com.epmet.dto.result.OperationScopeDefaultResultDTO">
+        SELECT id,
+               role_key,
+               operation_key,
+               scope_key,
+               del_flag,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        FROM operation_scope_default
+        WHERE ROLE_KEY = #{roleKey}
+    </select>
+
+    <!--查询操作的默认范围-->
+    <select id="listOpeDefaultScopes4Config"
+            resultType="com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO">
+        SELECT os.SCOPE_KEY,
+               os.SCOPE_NAME,
+               os.SCOPE_INDEX,
+               rs.OPERATION_KEY,
+               rs.ROLE_KEY,
+               CASE
+                   WHEN rs.ROLE_KEY IS NULL
+                       THEN FALSE
+                   ELSE TRUE
+                   END AS assigned
+        FROM operation_scope os
+                 LEFT JOIN operation_scope_default rs
+                           ON (os.SCOPE_KEY = rs.SCOPE_KEY AND rs.DEL_FLAG = 0 AND rs.ROLE_KEY = #{roleKey} AND
+                               OPERATION_KEY = #{operationKey})
+        WHERE os.DEL_FLAG = 0
+        ORDER BY os.SORT ASC
+    </select>
+
+    <select id="listOpeDefaultScopesByRoleAndOpeKey" resultType="com.epmet.entity.OperationScopeDefaultEntity">
+        SELECT *
+        FROM operation_scope_default
+        WHERE ROLE_KEY = #{roleKey}
+          AND OPERATION_KEY = #{operationKey}
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml
index dfd74bfea0..98cd9f675b 100755
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml
@@ -15,6 +15,11 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--根据角色key和操作key删除-->
+    <delete id="deleteByRoleKeyAndOpeKey">
+        DELETE FROM role_operation_default WHERE ROLE_KEY = #{roleKey} AND OPERATION_KEY = #{operationKey}
+    </delete>
+
     <select id="listAllValid" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
         SELECT o.ID, d.ROLE_KEY, o.OPERATION_KEY
         FROM role_operation_default d
@@ -33,5 +38,16 @@
           AND o.DEL_FLAG = 0
     </select>
 
-
+    <select id="listRoleDefaultOpsByRoleKey" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
+        SELECT o.OPERATION_KEY,
+               o.OPERATION_NAME,
+               CASE
+                   WHEN d.ROLE_KEY IS NOT NULL THEN TRUE
+                   ELSE FALSE END AS assigned
+        FROM operation o
+                 LEFT JOIN role_operation_default d ON (o.OPERATION_KEY = d.OPERATION_KEY AND d.DEL_FLAG = '0'
+            AND d.ROLE_KEY = #{roleKey})
+        WHERE o.DEL_FLAG = '0'
+        ORDER BY o.OPERATION_KEY ASC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-client/pom.xml b/epmet-module/gov-grid/gov-grid-client/pom.xml
index 297cb07121..5c477c501f 100644
--- a/epmet-module/gov-grid/gov-grid-client/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-client/pom.xml
@@ -19,6 +19,12 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-tools</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java
new file mode 100644
index 0000000000..bcce3cb4bd
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/DeletePartyMemberFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:05
+ */
+@Data
+public class DeletePartyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = 2325963253025239121L;
+
+    public interface AddUserInternalGroup {}
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+    private String partyMemberId;
+
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空",groups = {PartyMemberIdFormDTO.AddUserInternalGroup.class})
+    private String partyBranchId;
+
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
new file mode 100644
index 0000000000..3de9a6f231
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchAddFormDTO.java
@@ -0,0 +1,50 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 添加党支部入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:35
+ */
+@Data
+public class PartyBranchAddFormDTO implements Serializable {
+    private static final long serialVersionUID = -8102877381223078842L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空", groups = {AddUserInternalGroup.class})
+    private String gridId;
+
+    /**
+     * 党支部名称
+     */
+    @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+    @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+    private String partyBranchName;
+
+    /**
+     * 党支部概要信息
+     */
+    @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+    private String profile;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java
new file mode 100644
index 0000000000..d4f03416a6
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchEditFormDTO.java
@@ -0,0 +1,40 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 修改党支部信息入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 14:00
+ */
+@Data
+public class PartyBranchEditFormDTO implements Serializable {
+    private static final long serialVersionUID = -6739109166420798965L;
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class})
+    private String partyBranchId;
+    /**
+     * 党支部名称
+     */
+    @NotBlank(message = "请输入支部名称", groups = {AddUserShowGroup.class})
+    @Length(max = 20, message = "支部名称不能超过20个字", groups = AddUserShowGroup.class)
+    private String partyBranchName;
+
+    /**
+     * 党支部概要信息
+     */
+    @NotBlank(message = "请输入支部概要信息", groups = {AddUserShowGroup.class})
+    @Length(max = 500, message = "支部概要信息不能超过500个字", groups = AddUserShowGroup.class)
+    private String profile;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
new file mode 100644
index 0000000000..1849a8481b
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党支部id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 17:02
+ */
+@Data
+public class PartyBranchIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 5321430865413383354L;
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空",groups = {AddUserInternalGroup.class})
+    private String partyBranchId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java
new file mode 100644
index 0000000000..5f1c8681e4
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchListFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:11
+ */
+@Data
+public class PartyBranchListFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空", groups = {PartyBranchListFormDTO.AddUserInternalGroup.class})
+    private String gridId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java
new file mode 100644
index 0000000000..1e69866bbf
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyMemberIdFormDTO.java
@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党员id
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 14:48
+ */
+@Data
+public class PartyMemberIdFormDTO implements Serializable {
+    private static final long serialVersionUID = 3088195909670495675L;
+
+    public interface AddUserInternalGroup {}
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {AddUserInternalGroup.class})
+    private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
new file mode 100644
index 0000000000..3414805602
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 新增、修改党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 22:15
+ */
+@Data
+public class SaveOrUpdateParyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = -6896349967046364830L;
+
+    public interface UpdatePatyMemberGroup {
+    }
+
+    public interface SavePatyMemberGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "党支部id不能为空", groups = {SavePatyMemberGroup.class})
+    private String partyBranchId;
+
+    @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class})
+    private String name;
+
+    @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class})
+    private String idCard;
+
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+    private String mobile;
+
+    @NotBlank(message = "党员id不能为空", groups = {UpdatePatyMemberGroup.class})
+    private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java
new file mode 100644
index 0000000000..a959eb8e1a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchAddResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 添加党支部返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:45
+ */
+@Data
+public class PartyBranchAddResultDTO implements Serializable {
+    private static final long serialVersionUID = 5610858988982913682L;
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
new file mode 100644
index 0000000000..df3b4bc492
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党支部详情信息返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 21:45
+ */
+@Data
+public class PartyBranchInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 1184531127569286576L;
+
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+
+    /**
+     * 党支部名称
+     */
+    private String partyBranchName;
+
+    /**
+     * 党支部概要
+     */
+    private String profile;
+
+    /**
+     * 党支部所属网格名称
+     */
+    private String gridName;
+
+    /**
+     * 党支部所属网格id
+     */
+    private String gridId;
+
+    public PartyBranchInfoResultDTO(){
+        this.partyBranchId="";
+        this.partyBranchName="";
+        this.profile="";
+        this.gridName="";
+    }
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
new file mode 100644
index 0000000000..8057699458
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchListResultDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 3、党支部列表查询返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:13
+ */
+@Data
+public class PartyBranchListResultDTO implements Serializable {
+    private static final long serialVersionUID = 8342529186641647970L;
+    /**
+     * 支部id
+     */
+    private String partyBranchId;
+    /**
+     * 支部名称
+     */
+    private String partyBranchName;
+
+    /**
+     * 党员总数
+     */
+    private Integer totalPartyMember;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java
new file mode 100644
index 0000000000..09f2e6b1a9
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberIdResultDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员id:添加党员后返参、修改党员后返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 22:13
+ */
+@Data
+public class PartyMemberIdResultDTO implements Serializable {
+    private static final long serialVersionUID = 7467454908831748131L;
+    private String partyMemberId;
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
new file mode 100644
index 0000000000..b64a8b5462
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
@@ -0,0 +1,72 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员信息详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:19
+ */
+@Data
+public class PartyMemberInfoDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -4887670791276512339L;
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 1男2女0未知
+     */
+    private String gender;
+
+    /**
+     * true已激活，false未激活
+     */
+    private Boolean status;
+
+    /**
+     * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+     */
+    private String activeDesc;
+
+    /**
+     * 党支部名称（机关-网格-支部名）
+     */
+    private String partyBranchName;
+
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+
+    public PartyMemberInfoDetailResultDTO(){
+        this.partyMemberId="";
+        this.name="";
+        this.idCard="";
+        this.mobile="";
+        this.gender="";
+        this.status=Boolean.FALSE;
+        this.activeDesc="";
+        this.partyBranchName="";
+        this.partyBranchId="";
+    }
+}
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java
new file mode 100644
index 0000000000..7f812531c5
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoResultDTO.java
@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员列表返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 10:04
+ */
+@Data
+public class PartyMemberInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 627412197353847930L;
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别1男2女0未知
+     */
+    private String gender;
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 4189f2d981..1cd20945f9 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.30
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.36
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
index 889491379c..08aedd497f 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.36
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
\ No newline at end of file
+          memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index d31e134a9a..4e0313a293 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.30</version>
+    <version>0.3.36</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
new file mode 100644
index 0000000000..c74412719a
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java
@@ -0,0 +1,179 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.service.PartyBranchManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:25
+ */
+@RestController
+@RequestMapping("partybranch")
+public class PartyBranchManageController {
+    @Autowired
+    private PartyBranchManageService partyBranchManageService;
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO>
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 12:47
+     **/
+    @PostMapping("add")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD)
+    public Result<PartyBranchAddResultDTO> addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchAddFormDTO.AddUserShowGroup.class, PartyBranchAddFormDTO.AddUserInternalGroup.class);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = partyBranchManageService.addPartyBranch(formDTO);
+        return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchAddResultDTO>
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 15:31
+     **/
+    @PostMapping("edit")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_EDIT)
+    public Result<PartyBranchAddResultDTO> editPartyBranch(@RequestBody PartyBranchEditFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchEditFormDTO.AddUserShowGroup.class, PartyBranchEditFormDTO.AddUserInternalGroup.class);
+        partyBranchManageService.editPartyBranch(formDTO);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+        partyBranchAddResultDTO.setPartyBranchId(formDTO.getPartyBranchId());
+        return new Result<PartyBranchAddResultDTO>().ok(partyBranchAddResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.PartyBranchListResultDTO>>
+     * @author yinzuomei
+     * @description 党支部列表查询
+     * @Date 2020/6/17 16:15
+     **/
+    @PostMapping("list")
+    public Result<List<PartyBranchListResultDTO>> listPartyBranch(@RequestBody PartyBranchListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyBranchListFormDTO.AddUserInternalGroup.class);
+        return new Result<List<PartyBranchListResultDTO>>().ok(partyBranchManageService.listPartyBranch(formDTO));
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 删除党支部
+     * @Date 2020/6/17 18:23
+     **/
+    @PostMapping("delete")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_DELETE)
+    public Result deleteBranch(@RequestBody PartyBranchIdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        partyBranchManageService.deleteBranch(formDTO.getPartyBranchId());
+        return new Result();
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyBranchInfoResultDTO>
+     * @author yinzuomei
+     * @description 5、党支部详情信息查询
+     * @Date 2020/6/17 21:49
+     **/
+    @PostMapping("info")
+    public Result<PartyBranchInfoResultDTO> queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
+        PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId());
+        return new Result<PartyBranchInfoResultDTO>().ok(partyBranchInfoResultDTO);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 6、党员列表查询
+     * @Date 2020/6/18 0:17 
+     **/
+    @PostMapping("/partymember/list")
+    public Result<List<PartyMemberInfoResultDTO>> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
+        List<PartyMemberInfoResultDTO> list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId());
+        return new Result<List<PartyMemberInfoResultDTO>>().ok(list);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberIdResultDTO>
+     * @author yinzuomei
+     * @description 7、添加党员
+     * @Date 2020/6/17 22:25
+     **/
+    @PostMapping("/partymember/add")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_ADD)
+    public Result<PartyMemberIdResultDTO> addPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
+                , SaveOrUpdateParyMemberFormDTO.SavePatyMemberGroup.class);
+        PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO();
+        partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.addPartyMember(formDTO));
+        return new Result<PartyMemberIdResultDTO>().ok(partyMemberIdResultDTO);
+    }
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberIdResultDTO>
+     * @author yinzuomei
+     * @description 8、编辑党员
+     * @Date 2020/6/17 23:29
+     **/
+    @PostMapping("/partymember/edit")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_EDIT)
+    public Result<PartyMemberIdResultDTO> editPartyMember(@RequestBody SaveOrUpdateParyMemberFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SaveOrUpdateParyMemberFormDTO.AddUserShowGroup.class
+                , SaveOrUpdateParyMemberFormDTO.UpdatePatyMemberGroup.class);
+        PartyMemberIdResultDTO partyMemberIdResultDTO = new PartyMemberIdResultDTO();
+        partyMemberIdResultDTO.setPartyMemberId(partyBranchManageService.editPartyMember(formDTO));
+        return new Result<PartyMemberIdResultDTO>().ok(partyMemberIdResultDTO);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PartyMemberInfoDetailResultDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 10、党员详情
+     * @Date 2020/6/18 15:25
+     **/
+    @PostMapping("/partymember/detail")
+    public Result<PartyMemberInfoDetailResultDTO> queryPartyMemberDetail(@RequestBody PartyMemberIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PartyMemberIdFormDTO.AddUserInternalGroup.class);
+        return new Result<PartyMemberInfoDetailResultDTO>().ok(partyBranchManageService.queryPartyMemberDetail(formDTO.getPartyMemberId()));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param deletePartyMemberFormDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:51
+     **/
+    @PostMapping("partymember/delete")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_MEMBER_DELETE)
+    public Result  deletePartyMember(@RequestBody DeletePartyMemberFormDTO deletePartyMemberFormDTO){
+        ValidatorUtils.validateEntity(deletePartyMemberFormDTO, DeletePartyMemberFormDTO.AddUserInternalGroup.class);
+        partyBranchManageService.deletePartyMember(deletePartyMemberFormDTO);
+        return new Result();
+    }
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
new file mode 100644
index 0000000000..e87a4dad57
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/PartyBranchManageService.java
@@ -0,0 +1,104 @@
+package com.epmet.service;
+
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 12:47
+ */
+public interface PartyBranchManageService {
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.PartyBranchAddResultDTO
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 13:24
+     **/
+    PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.dto.result.PartyBranchAddResultDTO
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 14:30
+     **/
+    void editPartyBranch(PartyBranchEditFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.PartyBranchListResultDTO>
+     * @author yinzuomei
+     * @description 党支部列表查询
+     * @Date 2020/6/17 16:15
+     **/
+    List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO);
+
+    /**
+     * @return void
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 删除党支部
+     * @Date 2020/6/17 17:04
+     **/
+    void deleteBranch(String partyBranchId);
+
+    /**
+     * @return com.epmet.dto.result.PartyBranchInfoResultDTO
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 5、党支部详情信息查询
+     * @Date 2020/6/17 21:49 
+     **/
+    PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.PartyMemberInfoResultDTO>
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党员列表查询
+     * @Date 2020/6/18 10:06
+     **/
+    List<PartyMemberInfoResultDTO> listPartyMember(String partyBranchId);
+
+    /**
+     * @return java.lang.String
+     * @param formDTO
+     * @author yinzuomei
+     * @description 7、添加党员
+     * @Date 2020/6/17 22:26
+     **/
+    String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
+
+    /**
+     * @return java.lang.String
+     * @param formDTO
+     * @author yinzuomei
+     * @description 8、编辑党员
+     * @Date 2020/6/17 23:29 
+     **/
+    String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO);
+
+    /**
+     * @param partyMemberId
+     * @return com.epmet.dto.result.PartyMemberInfoDetailResultDTO
+     * @author yinzuomei
+     * @description 10、党员详情：根据党员id查询党员详情
+     * @Date 2020/6/18 15:25
+     **/
+    PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId);
+
+    /**
+     * @return void
+     * @param deletePartyMemberFormDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:51 
+     **/
+    void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
new file mode 100644
index 0000000000..0cf320e03f
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
@@ -0,0 +1,219 @@
+package com.epmet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
+import com.epmet.service.PartyBranchManageService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 基层治理-支部管理
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 13:23
+ */
+@Service
+public class PartyBranchManageServiceImpl implements PartyBranchManageService {
+    private Logger logger = LogManager.getLogger(PartyBranchManageServiceImpl.class);
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
+
+    @Override
+    public PartyBranchAddResultDTO addPartyBranch(PartyBranchAddFormDTO formDTO) {
+        CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+        customerPartyBranchDTO.setTotalPartyMember(0);
+        PartyBranchAddResultDTO partyBranchAddResultDTO = new PartyBranchAddResultDTO();
+        Result<String> result = govOrgOpenFeignClient.savePartyBranch(customerPartyBranchDTO);
+        if (result.success()) {
+            partyBranchAddResultDTO.setPartyBranchId(result.getData());
+        } else {
+            logger.error("添加党支部错误,调用gov-org-server接口返回失败");
+        }
+        return partyBranchAddResultDTO;
+    }
+
+    @Override
+    public void editPartyBranch(PartyBranchEditFormDTO formDTO) {
+        CustomerPartyBranchDTO customerPartyBranchDTO = ConvertUtils.sourceToTarget(formDTO, CustomerPartyBranchDTO.class);
+        customerPartyBranchDTO.setId(formDTO.getPartyBranchId());
+        Result<String> result = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranchDTO);
+        if (result.success()) {
+            logger.info("修改党支部信息成功");
+        }
+    }
+
+    @Override
+    public List<PartyBranchListResultDTO> listPartyBranch(PartyBranchListFormDTO formDTO) {
+        ListPartyBranchFormDTO listPartyBranchFormDTO = ConvertUtils.sourceToTarget(formDTO, ListPartyBranchFormDTO.class);
+        Result<List<ListPartyBranchResultDTO>> result = govOrgOpenFeignClient.listPartyBranch(listPartyBranchFormDTO);
+        List<ListPartyBranchResultDTO> resultList=result.getData();
+        if (result.success()) {
+            List<PartyBranchListResultDTO> list = ConvertUtils.sourceToTarget(resultList, PartyBranchListResultDTO.class);
+            return list;
+        } else {
+            logger.error(String.format("党支部列表查询失败入参:"), JSON.toJSONString(formDTO));
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public void deleteBranch(String partyBranchId) {
+        Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId);
+        if (!customerPartyBranchDTOResult.success()||null==customerPartyBranchDTOResult.getData()) {
+            logger.error(String.format("查询党支部信息失败入参:partyBranchId=%s",partyBranchId));
+            return;
+        }else{
+            if (null != customerPartyBranchDTOResult.getData() && customerPartyBranchDTOResult.getData().getTotalPartyMember() > 0) {
+                throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode());
+            }
+        }
+        Result delteResult=govOrgOpenFeignClient.deletePartyBranchById(partyBranchId);
+        if(!delteResult.success()){
+            logger.error(String.format("删除党支部失败入参:partyBranchId=%s",partyBranchId));
+        }
+    }
+
+    @Override
+    public PartyBranchInfoResultDTO queryPartyBranchInfo(String partyBranchId) {
+        PartyBranchInfoResultDTO partyBranchInfo = new PartyBranchInfoResultDTO();
+        Result<CustomerPartyBranchDTO> customerPartyBranchDTOResult = govOrgOpenFeignClient.getPartyBranchById(partyBranchId);
+        if (!customerPartyBranchDTOResult.success() || null == customerPartyBranchDTOResult.getData()) {
+            logger.error(String.format("党支部详情信息查询异常,partyBranchId=%s", partyBranchId));
+            return partyBranchInfo;
+        }
+        partyBranchInfo.setPartyBranchId(partyBranchId);
+        partyBranchInfo.setPartyBranchName(customerPartyBranchDTOResult.getData().getPartyBranchName());
+        partyBranchInfo.setProfile(customerPartyBranchDTOResult.getData().getProfile());
+        partyBranchInfo.setGridId(customerPartyBranchDTOResult.getData().getGridId());
+        Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerPartyBranchDTOResult.getData().getGridId());
+        if (gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getParentAgencyName())) {
+            partyBranchInfo.setGridName(String.format("%s-%s", gridInfoResult.getData().getParentAgencyName(), gridInfoResult.getData().getGridName()));
+        } else {
+            logger.error(String.format("查询网格基本信息失败,gridId=%s", customerPartyBranchDTOResult.getData().getGridId()));
+        }
+        return partyBranchInfo;
+    }
+
+    @Override
+    public List<PartyMemberInfoResultDTO> listPartyMember(String partyBranchId) {
+        Result<List<PartymemberBaseInfoResultDTO>> result = resiPartyMemberOpenFeignClient.listPartyMemberBaseInfo(partyBranchId);
+        if (result.success()) {
+            List<PartyMemberInfoResultDTO> list = ConvertUtils.sourceToTarget(result.getData(), PartyMemberInfoResultDTO.class);
+            return list;
+        }
+        logger.error("党员列表查询失败");
+        return new ArrayList<>();
+    }
+
+    @Override
+    public String addPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) {
+        //1、查询党支部信息
+        Result<CustomerPartyBranchDTO> customerPartyBranchResult = govOrgOpenFeignClient.getPartyBranchById(formDTO.getPartyBranchId());
+        if (!customerPartyBranchResult.success() || null == customerPartyBranchResult.getData()) {
+            throw new RenException("党支部信息获取失败");
+        }
+        //2、构造党员入参
+        CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData();
+        PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch);
+        Result<String> result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO);
+        //3、党支部总人数+1
+        if (result.success() && StringUtils.isNotBlank(result.getData())) {
+            //党支部总人数+1
+            customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
+            Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
+            if (updatePartyBranchResult.success()) {
+                logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
+            }
+        } else {
+            logger.error("添加党员异常");
+            throw new RenException(result.getCode());
+        }
+        return result.getData();
+    }
+
+    @Override
+    public String editPartyMember(SaveOrUpdateParyMemberFormDTO formDTO) {
+        PartymemberBaseInfoDTO partymemberBaseInfoDTO = new PartymemberBaseInfoDTO();
+        partymemberBaseInfoDTO.setIdCard(formDTO.getIdCard().trim());
+        partymemberBaseInfoDTO.setName(formDTO.getName().trim());
+        partymemberBaseInfoDTO.setMobile(formDTO.getMobile().trim());
+        partymemberBaseInfoDTO.setId(formDTO.getPartyMemberId());
+        Result<String> updateResult = resiPartyMemberOpenFeignClient.update(partymemberBaseInfoDTO);
+        if (updateResult.success() && StringUtils.isNotBlank(updateResult.getData())) {
+            logger.info("修改党员信息成功");
+            return updateResult.getData();
+        }else{
+            logger.error("修改党员信息失败");
+            throw new RenException(updateResult.getCode());
+        }
+    }
+
+    @Override
+    public PartyMemberInfoDetailResultDTO queryPartyMemberDetail(String partyMemberId) {
+        PartyMemberInfoDetailResultDTO partyMemberInfoDetailResultDTO=new PartyMemberInfoDetailResultDTO();
+        Result<PartyMemberBaseInfoDetailResultDTO> partyMemberResult=resiPartyMemberOpenFeignClient.queryPartyMemberBaseInfoById(partyMemberId);
+        if(partyMemberResult.success()&&null!=partyMemberResult.getData()){
+            partyMemberInfoDetailResultDTO=ConvertUtils.sourceToTarget(partyMemberResult.getData(),PartyMemberInfoDetailResultDTO.class);
+            Result<CustomerPartyBranchDTO> partyBranchDTOResult=govOrgOpenFeignClient.getPartyBranchById(partyMemberResult.getData().getPartyBranchId());
+            if(partyBranchDTOResult.success()){
+                String agencyName=partyBranchDTOResult.getData().getAgencyName();
+                String gridName=partyBranchDTOResult.getData().getGridName();
+                String branchName=partyBranchDTOResult.getData().getPartyBranchName();
+                partyMemberInfoDetailResultDTO.setPartyBranchName(String.format("%s-%s-%s",agencyName,gridName,branchName));
+                return partyMemberInfoDetailResultDTO;
+            }else{
+                logger.error("党员详情查询异常");
+            }
+        }
+        return partyMemberInfoDetailResultDTO ;
+    }
+
+    @Override
+    public void deletePartyMember(DeletePartyMemberFormDTO deletePartyMemberFormDTO) {
+        DelPartyMemberBaseInfoFormDTO formDTO = ConvertUtils.sourceToTarget(deletePartyMemberFormDTO, DelPartyMemberBaseInfoFormDTO.class);
+        Result result = resiPartyMemberOpenFeignClient.deltePartyMemberBaseInfo(formDTO);
+        if (!result.success()) {
+            throw new RenException(result.getCode());
+        }
+        //党支部总人数-1
+        Result decrResult = govOrgOpenFeignClient.decrPartyBranchMember(deletePartyMemberFormDTO.getPartyBranchId());
+        if (decrResult.success()) {
+            logger.info("删除党员成功,党支部总人数已-1");
+        }
+    }
+
+    private PartyMemberBaseInfoAddFormDTO getPartyMemberBaseInfoAddFormDTO(SaveOrUpdateParyMemberFormDTO formDTO,
+                                                                           CustomerPartyBranchDTO customerPartyBranchDTO) {
+        PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO=new PartyMemberBaseInfoAddFormDTO();
+        partyMemberBaseInfoAddFormDTO.setBranchId(formDTO.getPartyBranchId());
+        partyMemberBaseInfoAddFormDTO.setIdCard(formDTO.getIdCard().trim());
+        partyMemberBaseInfoAddFormDTO.setMobile(formDTO.getMobile().trim());
+        partyMemberBaseInfoAddFormDTO.setName(formDTO.getName().trim());
+
+        partyMemberBaseInfoAddFormDTO.setBranch(customerPartyBranchDTO.getPartyBranchName());
+        partyMemberBaseInfoAddFormDTO.setOrganization(customerPartyBranchDTO.getAgencyName());
+        partyMemberBaseInfoAddFormDTO.setCustomerId(customerPartyBranchDTO.getCustomerId());
+        return partyMemberBaseInfoAddFormDTO;
+    }
+}
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
index 7825e009a5..56d3dd745b 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.43
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
\ No newline at end of file
+          memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index e92c8aa434..2dd11868f2 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.42</version>
+    <version>0.3.43</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
index 16a76313ad..d8052e5fba 100644
--- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.27
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.29
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml
index d57997ab36..06d94d62d1 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.27</version>
+    <version>0.3.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
new file mode 100644
index 0000000000..c396f90605
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerPartyBranchDTO.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class CustomerPartyBranchDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 支部名称
+     */
+	private String partyBranchName;
+
+    /**
+     * 概要
+     */
+	private String profile;
+
+    /**
+     * 党支部所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 党员总数
+     */
+	private Integer totalPartyMember;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 网格所属机关id
+     */
+    private String agencyId;
+
+    /**
+     * 网格所属机关名字
+     */
+	private String agencyName;
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java
new file mode 100644
index 0000000000..ede50112e5
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListPartyBranchFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:27
+ */
+@Data
+public class ListPartyBranchFormDTO implements Serializable {
+    private static final long serialVersionUID = -5693132528876149747L;
+
+    /**
+     * 客户id
+     */
+    @NotBlank(message = "客户id不能为空")
+    private String customerId;
+
+    /**
+     * 网格id
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
index fff7b43caf..83bf82bfbf 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java
@@ -77,5 +77,15 @@ public class GridInfoResultDTO implements Serializable {
      * 省级组织名称
      */
     private String proviceName;
+
+    /**
+     * 网格所属机关id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 网格所属机关名称
+     */
+    private String parentAgencyName;
 }
 
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
index 8a5249c6ae..3c96aa6df6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java
@@ -21,9 +21,15 @@ public class LatestCustomerResultDTO implements Serializable {
 	 */
 	private String customerName;
 	/**
-	 * 用户所属组织id（任意一条）
+	 * 用户所属组织id
 	 */
 	private String agencyId;
+
+	/**
+	 * 用户所属组织名称
+	 */
+	private String agencyName;
+
 	/**
 	 * 工作人员头像
 	 */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
new file mode 100644
index 0000000000..b5d7e6cbce
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ListPartyBranchResultDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党支部列表查询返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 16:30
+ */
+@Data
+public class ListPartyBranchResultDTO implements Serializable {
+    private static final long serialVersionUID = 2306892144298853581L;
+    /**
+     * 支部id
+     */
+    private String partyBranchId;
+    /**
+     * 支部名称
+     */
+    private String partyBranchName;
+
+    /**
+     * 党员总数
+     */
+    private Integer totalPartyMember;
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
index f19eb67cea..241f2eb44f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
@@ -40,4 +40,14 @@ public class MineResultDTO implements Serializable {
 	 * 角色
 	 */
 	private List<String> roleList;
+
+	/**
+	 * 我所属的机关id
+	 */
+	private String agencyId;
+
+	/**
+	 * 我所属的机关名称
+	 */
+	private String myAgencyName;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index ff0a23f716..99bccaa484 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -1,16 +1,20 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
+import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -18,14 +22,13 @@ import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url =
-// "localhost:8092")
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class, url = "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgOpenFeignClientFallback.class)
 public interface GovOrgOpenFeignClient {
 
     /**
      * 根据Id查询agency
-     * 
+     *
      * @param agencyId
      * @return
      */
@@ -34,7 +37,7 @@ public interface GovOrgOpenFeignClient {
 
     /**
      * 根据staffId查询所属的组织机构
-     * 
+     *
      * @param staffId
      * @return
      */
@@ -58,4 +61,74 @@ public interface GovOrgOpenFeignClient {
      **/
     @PostMapping(value = "gov/org/customeragency/getpublishagencylist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<PublishAgencyListResultDTO> getPublishAgencyList(@PathVariable("staffId") String staffId);
+
+    /**
+     * @param customerPartyBranchDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 添加党支部
+     * @Date 2020/6/17 13:36
+     **/
+    @PostMapping(value = "gov/org/customerpartybranch/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> savePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+    /**
+     * @param customerPartyBranchDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 修改党支部信息
+     * @Date 2020/6/17 15:31
+     **/
+    @PutMapping(value = "gov/org/customerpartybranch/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> updatePartyBranch(@RequestBody CustomerPartyBranchDTO customerPartyBranchDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 根据客户id、网格id查询党支部列表
+     * @Date 2020/6/17 16:28
+     **/
+    @PostMapping(value = "gov/org/customerpartybranch/listpartybranch", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<ListPartyBranchResultDTO>> listPartyBranch(@RequestBody ListPartyBranchFormDTO formDTO);
+
+    /**
+     * @param partyBranchId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerPartyBranchDTO>
+     * @author yinzuomei
+     * @description 根据党支部id,查询党支部信息
+     * @Date 2020/6/17 18:01
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/get/{id}")
+    Result<CustomerPartyBranchDTO> getPartyBranchById(@PathVariable("id") String partyBranchId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 根据党支部id,删除党支部（存在党员的不允许删除）
+     * @Date 2020/6/17 18:08
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/delete/{id}")
+    Result deletePartyBranchById(@PathVariable("id") String partyBranchId);
+
+    /**
+     * @param gridId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>
+     * @Author yinzuomei
+     * @Description 根据网格id查询所属组织信息
+     * @Date 2020/4/26 23:16
+     **/
+    @GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
+    Result<GridInfoResultDTO> queryGridInfo(@PathVariable("gridId") String gridId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部宗人数-1
+     * @Date 2020/6/18 18:28
+     **/
+    @GetMapping(value = "gov/org/customerpartybranch/decrPartyBranchMember/{partyBranchId}")
+    Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId);
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index 8f6c108a7d..bcc224dd86 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -4,11 +4,17 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.ArticleGridResultDTO;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
 import com.epmet.dto.result.PublishAgencyListResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -37,4 +43,38 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getPublishAgencyList", staffId);
     }
 
+    @Override
+    public Result<String> savePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "save", customerPartyBranchDTO);
+    }
+
+    @Override
+    public Result<String> updatePartyBranch(CustomerPartyBranchDTO customerPartyBranchDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "update", customerPartyBranchDTO);
+    }
+
+    @Override
+    public Result<List<ListPartyBranchResultDTO>> listPartyBranch(ListPartyBranchFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "listpartybranch", formDTO);
+    }
+
+    @Override
+    public Result<CustomerPartyBranchDTO> getPartyBranchById(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "get", partyBranchId);
+    }
+
+    @Override
+    public Result deletePartyBranchById(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "deleteById", partyBranchId);
+    }
+
+    @Override
+    public Result<GridInfoResultDTO> queryGridInfo(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
+    }
+
+    @Override
+    public Result decrPartyBranchMember(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "decrPartyBranchMember",partyBranchId);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
index b126058bb6..03baf78da2 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.66
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.69
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
index 8df1c9c874..57f13f3fc7 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.67
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index d7df708edb..bab4db384b 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.66</version>
+    <version>0.3.69</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
new file mode 100644
index 0000000000..04ebd8e0a0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.excel.CustomerPartyBranchExcel;
+import com.epmet.service.CustomerPartyBranchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@RestController
+@RequestMapping("customerpartybranch")
+public class CustomerPartyBranchController {
+    
+    @Autowired
+    private CustomerPartyBranchService customerPartyBranchService;
+
+    @GetMapping("page")
+    public Result<PageData<CustomerPartyBranchDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<CustomerPartyBranchDTO> page = customerPartyBranchService.page(params);
+        return new Result<PageData<CustomerPartyBranchDTO>>().ok(page);
+    }
+
+    @GetMapping("get/{id}")
+    public Result<CustomerPartyBranchDTO> get(@PathVariable("id") String id){
+        CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
+        return new Result<CustomerPartyBranchDTO>().ok(data);
+    }
+
+    @PostMapping("save")
+    public Result<String> save(@RequestBody CustomerPartyBranchDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return new Result<String>().ok(customerPartyBranchService.save(dto));
+    }
+
+    @PutMapping("update")
+    public Result update(@RequestBody CustomerPartyBranchDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        customerPartyBranchService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        customerPartyBranchService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("delete/{id}")
+    public Result deleteById(@PathVariable("id") String id){
+        CustomerPartyBranchDTO data = customerPartyBranchService.get(id);
+        if(null!=data&&data.getTotalPartyMember()>0){
+            throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_BRANCH.getCode());
+        }
+        customerPartyBranchService.deleteById(id);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<CustomerPartyBranchDTO> list = customerPartyBranchService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, CustomerPartyBranchExcel.class);
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO>>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 党支部列表查询,供gov-grid服务调用
+     * @Date 2020/6/17 16:33
+     **/
+    @PostMapping("listpartybranch")
+    public Result<List<ListPartyBranchResultDTO>> listpartybranch(@RequestBody ListPartyBranchFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<ListPartyBranchResultDTO>>().ok(customerPartyBranchService.listpartybranch(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部人数-1
+     * @Date 2020/6/18 18:31
+     **/
+    @GetMapping("decrPartyBranchMember/{partyBranchId}")
+    public Result decrPartyBranchMember(@PathVariable("partyBranchId") String partyBranchId){
+        customerPartyBranchService.decrPartyBranchMember(partyBranchId);
+        return new Result();
+    }
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
new file mode 100644
index 0000000000..007af50fde
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerPartyBranchDao.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.entity.CustomerPartyBranchEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Mapper
+public interface CustomerPartyBranchDao extends BaseDao<CustomerPartyBranchEntity> {
+    //根据客户id、网格id查询党支部列表
+    List<ListPartyBranchResultDTO> selectListPartyBranchResultDTO(ListPartyBranchFormDTO formDTO);
+
+    //党支部人数-1
+    int decrPartyBranchMember(String partyBranchId);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
new file mode 100644
index 0000000000..98610e75f7
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerPartyBranchEntity.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("customer_party_branch")
+public class CustomerPartyBranchEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 支部名称
+     */
+	private String partyBranchName;
+
+    /**
+     * 概要
+     */
+	private String profile;
+
+    /**
+     * 党支部所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 党员总数
+     */
+	private Integer totalPartyMember;
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerPartyBranchExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerPartyBranchExcel.java
new file mode 100644
index 0000000000..7766ed1260
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerPartyBranchExcel.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class CustomerPartyBranchExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "支部名称")
+    private String partyBranchName;
+
+    @Excel(name = "概要")
+    private String profile;
+
+    @Excel(name = "党支部所属网格id")
+    private String gridId;
+
+    @Excel(name = "客户id")
+    private String customerId;
+
+    @Excel(name = "党员总数")
+    private Integer totalPartymember;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerPartyBranchRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerPartyBranchRedis.java
new file mode 100644
index 0000000000..e5d8d70e5e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerPartyBranchRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Component
+public class CustomerPartyBranchRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
new file mode 100644
index 0000000000..e373bcb0f1
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerPartyBranchService.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.entity.CustomerPartyBranchEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+public interface CustomerPartyBranchService extends BaseService<CustomerPartyBranchEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<CustomerPartyBranchDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    PageData<CustomerPartyBranchDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<CustomerPartyBranchDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    List<CustomerPartyBranchDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return CustomerPartyBranchDTO
+     * @author generator
+     * @date 2020-06-17
+     */
+    CustomerPartyBranchDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    String save(CustomerPartyBranchDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void update(CustomerPartyBranchDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void delete(String[] ids);
+
+    /**
+     * @return java.util.List<com.epmet.dto.form.ListPartyBranchFormDTO>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 党支部列表查询,供gov-grid服务调用
+     * @Date 2020/6/17 16:33
+     **/
+    List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO);
+
+    /**
+     * @return void
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 党支部人数-1
+     * @Date 2020/6/18 18:31
+     **/
+    void decrPartyBranchMember(String partyBranchId);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index bcc4ecf11c..00436e9b59 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -27,7 +27,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
 import com.epmet.dao.CustomerAgencyDao;
@@ -452,6 +451,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         gridInfoResultDTO.setGridId(gridId);
         gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId());
         gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
+        gridInfoResultDTO.setParentAgencyId(customerGridDTO.getPid());
+        gridInfoResultDTO.setParentAgencyName(customerAgencyService.get(customerGridDTO.getPid()).getOrganizationName());
         String pids=customerGridDTO.getPids();
         String[] pidArray = pids.split(":");
         for(String agencyId:pidArray){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
new file mode 100644
index 0000000000..5ec7c27668
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.CustomerPartyBranchDao;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerPartyBranchDTO;
+import com.epmet.dto.form.ListPartyBranchFormDTO;
+import com.epmet.dto.result.ListPartyBranchResultDTO;
+import com.epmet.entity.CustomerPartyBranchEntity;
+import com.epmet.redis.CustomerPartyBranchRedis;
+import com.epmet.service.CustomerAgencyService;
+import com.epmet.service.CustomerGridService;
+import com.epmet.service.CustomerPartyBranchService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党支部信息
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Service
+public class CustomerPartyBranchServiceImpl extends BaseServiceImpl<CustomerPartyBranchDao, CustomerPartyBranchEntity> implements CustomerPartyBranchService {
+
+    @Autowired
+    private CustomerPartyBranchRedis customerPartyBranchRedis;
+    @Autowired
+    private CustomerGridService customerGridService;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
+
+    @Override
+    public PageData<CustomerPartyBranchDTO> page(Map<String, Object> params) {
+        IPage<CustomerPartyBranchEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, CustomerPartyBranchDTO.class);
+    }
+
+    @Override
+    public List<CustomerPartyBranchDTO> list(Map<String, Object> params) {
+        List<CustomerPartyBranchEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, CustomerPartyBranchDTO.class);
+    }
+
+    private QueryWrapper<CustomerPartyBranchEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<CustomerPartyBranchEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public CustomerPartyBranchDTO get(String id) {
+        CustomerPartyBranchEntity entity = baseDao.selectById(id);
+        CustomerPartyBranchDTO customerPartyBranchDTO=ConvertUtils.sourceToTarget(entity, CustomerPartyBranchDTO.class);
+        if(null!=customerPartyBranchDTO){
+            CustomerGridDTO customerGridDTO=customerGridService.get(entity.getGridId());
+            if(null!=customerGridDTO){
+                customerPartyBranchDTO.setGridName(customerGridDTO.getGridName());
+                CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerGridDTO.getPid());
+                if(null!=customerAgencyDTO){
+                    customerPartyBranchDTO.setAgencyId(customerAgencyDTO.getId());
+                    customerPartyBranchDTO.setAgencyName(customerAgencyDTO.getOrganizationName());
+                }
+            }
+        }
+        return customerPartyBranchDTO;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String save(CustomerPartyBranchDTO dto) {
+        CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class);
+        insert(entity);
+        return entity.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(CustomerPartyBranchDTO dto) {
+        CustomerPartyBranchEntity entity = ConvertUtils.sourceToTarget(dto, CustomerPartyBranchEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public List<ListPartyBranchResultDTO> listpartybranch(ListPartyBranchFormDTO formDTO) {
+        return baseDao.selectListPartyBranchResultDTO(formDTO);
+    }
+
+    @Override
+    public void decrPartyBranchMember(String partyBranchId) {
+        baseDao.decrPartyBranchMember(partyBranchId);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
index 17f9f75731..ba90138f12 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
@@ -131,6 +131,11 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         CustomerStaffAgencyDTO customerStaffAgencyDTO = baseDao.selectLatestCustomerByStaff(userId);
 
         resultDTO.setAgencyId(customerStaffAgencyDTO.getAgencyId());
+        CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerStaffAgencyDTO.getAgencyId());
+        if(null!=customerAgencyDTO){
+            //用户所属机关名称
+            resultDTO.setAgencyName(customerAgencyDTO.getOrganizationName());
+        }
         resultDTO.setCustomerId(customerStaffAgencyDTO.getCustomerId());
         //获取工作人员头像
         CustomerStaffDTO customerStaffParam = new CustomerStaffDTO();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 32ec8df9ab..eea0a80d21 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerStaffAgencyDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
@@ -171,7 +172,15 @@ public class StaffServiceImpl implements StaffService {
 		result.setStaffHeadPhoto(staffDetail.getHeadPhoto());
 		result.setGender(staffDetail.getGender());
 		result.setRoleList(staffDetail.getRoles());
+		//用户所属机关名称（上级-本级）
 		result.setAgencyName(agencyName);
+		//新增返参： 用户所属机关id
+		result.setAgencyId(customerStaffAgency.getAgencyId());
+		CustomerAgencyDTO customerAgencyDTO=customerAgencyService.get(customerStaffAgency.getAgencyId());
+		if(null!=customerAgencyDTO){
+			//用户所属机关名称
+			result.setMyAgencyName(customerAgencyDTO.getOrganizationName());
+		}
 		return result;
 	}
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
new file mode 100644
index 0000000000..e9e1f1d17b
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerPartyBranchDao.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.CustomerPartyBranchDao">
+
+    <resultMap type="com.epmet.entity.CustomerPartyBranchEntity" id="customerPartyBranchMap">
+        <result property="id" column="ID"/>
+        <result property="partyBranchName" column="PARTY_BRANCH_NAME"/>
+        <result property="profile" column="PROFILE"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="totalPartyMember" column="TOTAL_PARTY_MEMBER"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <!-- 根据客户id、网格id查询党支部列表  -->
+    <select id="selectListPartyBranchResultDTO" parameterType="com.epmet.dto.form.ListPartyBranchFormDTO"
+            resultType="com.epmet.dto.result.ListPartyBranchResultDTO">
+            SELECT
+                id as partyBranchId,
+                PARTY_BRANCH_NAME as partyBranchName,
+                TOTAL_PARTY_MEMBER AS totalPartyMember
+            FROM
+                customer_party_branch
+            WHERE
+                DEL_FLAG = '0'
+                AND CUSTOMER_ID =#{customerId}
+                AND GRID_ID = #{gridId}
+            ORDER BY
+                CREATED_TIME DESC
+    </select>
+    <!-- 党支部人数-1 -->
+    <update id="decrPartyBranchMember" parameterType="java.lang.String">
+        UPDATE customer_party_branch
+        SET TOTAL_PARTY_MEMBER = TOTAL_PARTY_MEMBER - 1
+        WHERE
+            id = #{partyBranchId}
+            AND DEL_FLAG = '0'
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
index d55974b2db..16ec28dfbb 100644
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.27
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.28
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
\ No newline at end of file
+          memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml
index 6bec282580..382580cd85 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.27</version>
+    <version>0.3.28</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
index 06c5b49ab8..da5f4c1504 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -53,6 +54,11 @@ public class AddArticleTagsFormDTO implements Serializable {
      */
     private String createdBy;
 
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
     /**
      * 更新人
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
index 80855c22df..a08cd1f375 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.54
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.56
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
index 36b6cb3e26..75870071a0 100644
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.54
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.55
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络
@@ -14,4 +14,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 400M
\ No newline at end of file
+          memory: 350M
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index 713902afb2..3e684e0f72 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.54</version>
+    <version>0.3.56</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
index 7cc723b070..b22716bc16 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
@@ -105,7 +105,6 @@ public class ArticleController {
      * @date 2020/6/2 16:50
      **/
     @PostMapping("oprationlist")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OPERATION_LIST)
     public Result<List<ArticleOperationResultDTO>> operationList(@RequestBody ArticleOperationFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ArticleOperationFormDTO.AddUserInternalGroup.class);
         List<ArticleOperationResultDTO> list =
@@ -121,7 +120,6 @@ public class ArticleController {
      * @date 2020/6/3 9:44
      **/
     @PostMapping("articledetail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DETAIL)
     public Result<GovArticleDetailResultDTO> articleDetail(@RequestBody GovArticleDetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GovArticleDetailFormDTO.AddUserInternalGroup.class);
         GovArticleDetailResultDTO articleDetail = articleService.queryGovArticleDetail(formDTO.getArticleId());
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 10c59c6450..2e3d296122 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -1058,13 +1058,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		try {
 			//审核通过
 			this.updateAuditStatusFailById(draftId, syncScanResult);
-			this.publishDraftToArticle(draft);
+			ArticleEntity articleEntity = this.publishDraftToArticle(draft);
 			UpdateCustomerTagCacheDTO updateCustomerTagCacheDTO = this.updateCustomerTag(tokenDto, draftId);
 			if (updateCustomerTagCacheDTO == null) {
 				return;
 			}
 			List<UpdateGridTagCacheDTO> updateGridTagCacheDTOS = this.updateGridTag(tokenDto, draftId, updateCustomerTagCacheDTO);
-			this.addArticleTags(updateCustomerTagCacheDTO, draftId, tokenDto);
+			this.addArticleTags(updateCustomerTagCacheDTO, draftId, tokenDto, articleEntity.getCreatedTime());
 
 			//更新redis
 			try {
@@ -1279,10 +1279,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 
 	/**
 	 * @param formDto
-	 * @Description 给文章挂标签  article_tags
+	 * @param createdTime
+	 * @Description 给文章挂标签  article_tags,创建时间与文章保持一致
 	 * @author zxc
 	 */
-	public void addArticleTags(UpdateCustomerTagCacheDTO formDto, String draftId, TokenDto tokenDto) {
+	public void addArticleTags(UpdateCustomerTagCacheDTO formDto, String draftId, TokenDto tokenDto, Date createdTime) {
 		List<AddArticleTagsFormDTO> addArticleTags = new ArrayList<>();
 		List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo();
 		DraftDTO draft = draftService.get(draftId);
@@ -1296,6 +1297,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			addArticleTag.setCustomerId(customerId);
 			addArticleTag.setArticleId(articleId);
 			BeanUtils.copyProperties(resultDTO, addArticleTag);
+			addArticleTag.setCreatedTime(createdTime);
 			addArticleTags.add(addArticleTag);
 		});
 		articleTagsDao.addArticleTags(addArticleTags);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
index 4995354629..92c4fb67f6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml
@@ -8,8 +8,9 @@
         INSERT INTO article_tags ( ID, CUSTOMER_ID, ARTICLE_ID, TAG_ID, TAG_NAME, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="addArticleTags" item="tag" separator=",">
-            ( REPLACE ( UUID(), '-', '' ),#{tag.customerId}, #{tag.articleId}, #{tag.tagId}, #{tag.tagName}, #{tag.delFlag},
-            #{tag.revision}, #{tag.createdBy}, NOW(),#{tag.updatedBy}, NOW())
+            ( REPLACE ( UUID(), '-', '' ),#{tag.customerId}, #{tag.articleId}, #{tag.tagId}, #{tag.tagName},
+            #{tag.delFlag},
+            #{tag.revision}, #{tag.createdBy}, #{tag.createdTime,jdbcType=TIMESTAMP},#{tag.updatedBy}, NOW())
         </foreach>
     </select>
     <select id="selectInitData" resultType="com.epmet.entity.ArticleTagsEntity">
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 1942525951..d67b500d59 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import java.util.List;
 import java.util.Map;
 
-//, url = "localhost:8087"
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087")
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
index b3c13859b7..b59a5c7a20 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java
@@ -2,22 +2,12 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerHomeDTO;
-import com.epmet.dto.form.AddAgencyFormDTO;
-import com.epmet.dto.form.AddRootAgencyFormDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.result.AddAgencyResultDTO;
-import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import com.epmet.feign.fallback.OperCustomizeFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-import java.util.Map;
-
 //@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
 @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
 public interface OperCustomizeFeignClient {
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
new file mode 100644
index 0000000000..946e0ea1fa
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartyBranchMembersDTO.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.partymember.dto.partymember;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class PartyBranchMembersDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 党支部id，customer_party_branch.id
+     */
+	private String branchId;
+
+    /**
+     * 党员库表主键,partymember_base_info.id
+     */
+	private String partymemberBaseInfoId;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
new file mode 100644
index 0000000000..9c3f0334e6
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberAuthRecordDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.partymember.dto.partymember;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class PartymemberAuthRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * partymember_base_info.id
+     */
+	private String partymemberBaseInfoId;
+
+    /**
+     * 认证居民id
+     */
+	private String userId;
+
+    /**
+     * 认证时间(和partymember_info表时间一致)
+     */
+	private Date authTime;
+
+    /**
+     * 认证网格id
+     */
+	private String gridId;
+
+    /**
+     * 认证客户id
+     */
+	private String customerId;
+
+    /**
+     * 认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活
+     */
+	private String authDesc;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java
new file mode 100644
index 0000000000..eac10a7bbf
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/DelPartyMemberBaseInfoFormDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 删除党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 18:09
+ */
+@Data
+public class DelPartyMemberBaseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2735219691600150687L;
+    public interface AddUserInternalGroup {}
+
+    /**
+     * 党员id
+     */
+    @NotBlank(message = "党员id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+    private String partyMemberId;
+
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空",groups = {DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class})
+    private String partyBranchId;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberBaseInfoAddFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberBaseInfoAddFormDTO.java
new file mode 100644
index 0000000000..0ed42ab876
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberBaseInfoAddFormDTO.java
@@ -0,0 +1,64 @@
+package com.epmet.resi.partymember.dto.partymember.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 添加党员入参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/17 22:42
+ */
+@Data
+public class PartyMemberBaseInfoAddFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 客户Id (customer.id)
+     */
+    @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 党支部id
+     */
+    @NotBlank(message = "党支部id不能为空", groups = {AddUserInternalGroup.class})
+    private String branchId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class})
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = {AddUserShowGroup.class})
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
+    private String mobile;
+
+    /**
+     * 所在党组织（网格直属机关的名字）
+     */
+    @NotBlank(message = "党组织不能为空", groups = {AddUserShowGroup.class})
+    private String organization;
+
+    /**
+     * 所在党支部
+     */
+    @NotBlank(message = "党支部名称不能为空", groups = {AddUserShowGroup.class})
+    private String branch;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java
new file mode 100644
index 0000000000..8bf05dbcb8
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberBaseInfoDetailResultDTO.java
@@ -0,0 +1,56 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员详情返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 15:31
+ */
+@Data
+public class PartyMemberBaseInfoDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -1416472090639851835L;
+
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 1男2女0未知
+     */
+    private String gender;
+
+    /**
+     * true已激活，false未激活
+     */
+    private Boolean status;
+
+    /**
+     * 返回：账号于2019年10月31日在海泊桥社区-第一网格激活
+     */
+    private String activeDesc;
+
+    /**
+     * 党支部id
+     */
+    private String partyBranchId;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberBaseInfoResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberBaseInfoResultDTO.java
new file mode 100644
index 0000000000..0dd6a85a7d
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberBaseInfoResultDTO.java
@@ -0,0 +1,31 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 党员列表
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/18 10:15
+ */
+@Data
+public class PartymemberBaseInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 8406798885012269801L;
+
+    /**
+     * 党员id
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String gender;
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
index ef7105186d..5785bf4489 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java
@@ -1,9 +1,18 @@
 package com.epmet.resi.partymember.feign;
 
-import org.springframework.cloud.openfeign.FeignClient;
-
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -11,6 +20,57 @@ import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientF
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:12
  */
+//@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class,url = "http://localhost:8096")
 @FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class)
 public interface ResiPartyMemberOpenFeignClient {
+
+    /**
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @description 更新党员库信息
+     * @Date 2020/6/17 23:36
+     **/
+    @PutMapping(value = "/resi/partymember/partymemberbaseinfo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> update(@RequestBody PartymemberBaseInfoDTO dto);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @author yinzuomei
+     * @description 添加党员
+     * @Date 2020/6/17 23:00
+     **/
+    @PostMapping(value = "/resi/partymember/partymemberbaseinfo/addPartyMemberBaseInfo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<String> addPartyMemberBaseInfo(@RequestBody PartyMemberBaseInfoAddFormDTO formDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<PartymemberBaseInfoResultDTO>>
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 根据党支部id,查询党员列表
+     * @Date 2020/6/18 10:12
+     **/
+    @GetMapping(value = "/resi/partymember/partymemberbaseinfo/listPartyMemberBaseInfo/{partyBranchId}")
+    Result<List<PartymemberBaseInfoResultDTO>> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param partyMemberId 党员库id主键
+     * @author yinzuomei
+     * @description 根据党员id查询党员信息
+     * @Date 2020/6/18 15:30
+     **/
+    @GetMapping(value = "/resi/partymember/partymemberbaseinfo/queryPartyMemberBaseInfoById/{partyMemberId}")
+    Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:57
+     **/
+    @PostMapping(value = "/resi/partymember/partymemberbaseinfo/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO);
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
index cdcbbcbc92..058af67dfa 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java
@@ -1,8 +1,18 @@
 package com.epmet.resi.partymember.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -11,4 +21,29 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOpenFeignClient {
+
+    @Override
+    public Result<String> update(PartymemberBaseInfoDTO partymemberBaseInfoDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "update", partymemberBaseInfoDTO);
+    }
+
+    @Override
+    public Result<String> addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "addPartyMemberBaseInfo", formDTO);
+    }
+
+    @Override
+    public Result<List<PartymemberBaseInfoResultDTO>> listPartyMemberBaseInfo(String partyBranchId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "listPartyMemberBaseInfo", partyBranchId);
+    }
+
+    @Override
+    public Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(String partyMemberId) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartyMemberBaseInfoById", partyMemberId);
+    }
+
+    @Override
+    public Result deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "deltePartyMemberBaseInfo", formDTO);
+    }
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 7fa0b47f47..c700a7b085 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.44
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.50
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
index 01ea60963d..4eaf11b7e0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.44
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.50
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 2bbb496183..b7715679a3 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.44</version>
+    <version>0.3.50</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
index bb0795b43b..ab366fd058 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
@@ -135,4 +135,9 @@ public interface PartyMemberConstant {
 	 * 已读
 	 */
 	String READ = "read";
+
+	/**
+	 * 党员详情界面：账号于2020年10月31日在海泊桥社区-第一网格激活
+	 */
+	String AUTH_DESC="账户于%s年%s月%s日在%s激活";
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
new file mode 100644
index 0000000000..9fc1a5c0ff
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyBranchMembersController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.modules.partymember.excel.PartyBranchMembersExcel;
+import com.epmet.modules.partymember.service.PartyBranchMembersService;
+import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@RestController
+@RequestMapping("partybranchmembers")
+public class PartyBranchMembersController {
+    
+    @Autowired
+    private PartyBranchMembersService partyBranchMembersService;
+
+    @GetMapping("page")
+    public Result<PageData<PartyBranchMembersDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PartyBranchMembersDTO> page = partyBranchMembersService.page(params);
+        return new Result<PageData<PartyBranchMembersDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PartyBranchMembersDTO> get(@PathVariable("id") String id){
+        PartyBranchMembersDTO data = partyBranchMembersService.get(id);
+        return new Result<PartyBranchMembersDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PartyBranchMembersDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        partyBranchMembersService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PartyBranchMembersDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        partyBranchMembersService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        partyBranchMembersService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PartyBranchMembersDTO> list = partyBranchMembersService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PartyBranchMembersExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java
new file mode 100644
index 0000000000..295a615e48
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberAuthRecordController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.modules.partymember.excel.PartymemberAuthRecordExcel;
+import com.epmet.modules.partymember.service.PartymemberAuthRecordService;
+import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@RestController
+@RequestMapping("partymemberauthrecord")
+public class PartymemberAuthRecordController {
+    
+    @Autowired
+    private PartymemberAuthRecordService partymemberAuthRecordService;
+
+    @GetMapping("page")
+    public Result<PageData<PartymemberAuthRecordDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<PartymemberAuthRecordDTO> page = partymemberAuthRecordService.page(params);
+        return new Result<PageData<PartymemberAuthRecordDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<PartymemberAuthRecordDTO> get(@PathVariable("id") String id){
+        PartymemberAuthRecordDTO data = partymemberAuthRecordService.get(id);
+        return new Result<PartymemberAuthRecordDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody PartymemberAuthRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        partymemberAuthRecordService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody PartymemberAuthRecordDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        partymemberAuthRecordService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        partymemberAuthRecordService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PartymemberAuthRecordDTO> list = partymemberAuthRecordService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, PartymemberAuthRecordExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
index 438594f0b3..f5fd7ec421 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java
@@ -28,15 +28,18 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.partymember.excel.PartymemberBaseInfoExcel;
 import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -75,11 +78,11 @@ public class PartymemberBaseInfoController {
     }
 
     @PutMapping
-    public Result update(@RequestBody PartymemberBaseInfoDTO dto){
+    public Result<String> update(@RequestBody PartymemberBaseInfoDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         partymemberBaseInfoService.update(dto);
-        return new Result();
+        return new Result().ok(dto.getId());
     }
 
     @DeleteMapping
@@ -121,4 +124,56 @@ public class PartymemberBaseInfoController {
         ValidatorUtils.validateEntity(formDTO);
         return partymemberBaseInfoService.audited(formDTO);
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.lang.String>
+     * @param formDTO
+     * @author yinzuomei
+     * @description 添加党员
+     * @Date 2020/6/17 22:47
+     **/
+    @PostMapping("addPartyMemberBaseInfo")
+    public Result<String> addPartyMemberBaseInfo(@RequestBody PartyMemberBaseInfoAddFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        String partyMemberId=partymemberBaseInfoService.addPartyMemberBaseInfo(formDTO);
+        return new Result<String>().ok(partyMemberId);
+    }
+
+    /**
+     * @param partyBranchId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO>>
+     * @author yinzuomei
+     * @description 根据党支部id, 查询党员列表
+     * @Date 2020/6/18 10:18
+     **/
+    @GetMapping("listPartyMemberBaseInfo/{partyBranchId}")
+    public Result<List<PartymemberBaseInfoResultDTO>> listPartyMemberBaseInfo(@PathVariable("partyBranchId") String partyBranchId) {
+        return new Result<List<PartymemberBaseInfoResultDTO>>().ok(partymemberBaseInfoService.listPartyMemberBaseInfo(partyBranchId));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO>
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:15
+     **/
+    @GetMapping("queryPartyMemberBaseInfoById/{partyMemberId}")
+    public Result<PartyMemberBaseInfoDetailResultDTO> queryPartyMemberBaseInfoById(@PathVariable("partyMemberId") String partyMemberId){
+        return new Result<PartyMemberBaseInfoDetailResultDTO>().ok(partymemberBaseInfoService.queryPartyMemberBaseInfoById(partyMemberId));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param formDTO
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:45
+     **/
+    @PostMapping("delete")
+    public Result deltePartyMemberBaseInfo(@RequestBody DelPartyMemberBaseInfoFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,DelPartyMemberBaseInfoFormDTO.AddUserInternalGroup.class);
+        partymemberBaseInfoService.deltePartyMemberBaseInfo(formDTO);
+        return new Result();
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
new file mode 100644
index 0000000000..c70979e411
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartyBranchMembersDao.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Mapper
+public interface PartyBranchMembersDao extends BaseDao<PartyBranchMembersEntity> {
+    int deletePartyBranchMember(@Param("partyBranchId") String partyBranchId,
+                                @Param("partyMemberId") String partyMemberId,
+                                @Param("userId") String userId);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
new file mode 100644
index 0000000000..b49ca7552f
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Mapper
+public interface PartymemberAuthRecordDao extends BaseDao<PartymemberAuthRecordEntity> {
+
+    /**
+     * @return com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity
+     * @param partymemberBaseInfoId
+     * @author yinzuomei
+     * @description 根据党员库id,查询党员认证信息
+     * @Date 2020/6/18 0:04
+     **/
+    PartymemberAuthRecordEntity selectByPartyMemberBaseInfoId(String partymemberBaseInfoId);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
index 6c614045fb..3b756089a9 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java
@@ -22,9 +22,11 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -78,4 +80,31 @@ public interface PartymemberBaseInfoDao extends BaseDao<PartymemberBaseInfoEntit
 	 * @Date 2020/4/26 23:43
 	 **/
 	List<ReviewedParyMemberResultDTO> selectListReviewedParyMember(ReviewedParyMemberFormDTO formDTO);
+
+	/**
+	 * @return com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity
+	 * @param idCard
+	 * @author yinzuomei
+	 * @description 根据身份证号查询党员库
+	 * @Date 2020/6/17 23:49
+	 **/
+    List<PartymemberBaseInfoEntity> selectByIdCard(@Param("idCard") String idCard,@Param("id")String id);
+
+    /**
+     * @return java.util.List<com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity>
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 根据党支部id，查询党员列表
+     * @Date 2020/6/18 11:05
+     **/
+    List<PartymemberBaseInfoEntity> selectListPartyMemberBaseInfo(String partyBranchId);
+
+    /**
+     * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:24
+     **/
+    PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
new file mode 100644
index 0000000000..4ab74c40bc
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartyBranchMembersEntity.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("party_branch_members")
+public class PartyBranchMembersEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 党支部id，customer_party_branch.id
+     */
+	private String branchId;
+
+    /**
+     * 党员库表主键,partymember_base_info.id
+     */
+	private String partymemberBaseInfoId;
+
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
new file mode 100644
index 0000000000..8639d00ea1
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberAuthRecordEntity.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("partymember_auth_record")
+public class PartymemberAuthRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * partymember_base_info.id
+     */
+	private String partymemberBaseInfoId;
+
+    /**
+     * 认证居民id
+     */
+	private String userId;
+
+    /**
+     * 认证时间(和partymember_info表时间一致)
+     */
+	private Date authTime;
+
+    /**
+     * 认证网格id
+     */
+	private String gridId;
+
+    /**
+     * 认证客户id
+     */
+	private String customerId;
+
+    /**
+     * 认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活
+     */
+	private String authDesc;
+
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartyBranchMembersExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartyBranchMembersExcel.java
new file mode 100644
index 0000000000..5a5eec75c8
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartyBranchMembersExcel.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class PartyBranchMembersExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "党支部id，customer_party_branch.id")
+    private String branchId;
+
+    @Excel(name = "党员库表主键,partymember_base_info.id")
+    private String partymemberBaseInfoId;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberAuthRecordExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberAuthRecordExcel.java
new file mode 100644
index 0000000000..d75dc1d6e7
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberAuthRecordExcel.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Data
+public class PartymemberAuthRecordExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "partymember_base_info.id")
+    private String partymemberBaseInfoId;
+
+    @Excel(name = "认证居民id")
+    private String userId;
+
+    @Excel(name = "认证时间(和partymember_info表时间一致)")
+    private Date authTime;
+
+    @Excel(name = "认证网格id")
+    private String gridId;
+
+    @Excel(name = "认证客户id")
+    private String customerId;
+
+    @Excel(name = "认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活")
+    private String authDesc;
+
+    @Excel(name = "删除标识")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartyBranchMembersRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartyBranchMembersRedis.java
new file mode 100644
index 0000000000..b437b564a2
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartyBranchMembersRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Component
+public class PartyBranchMembersRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberAuthRecordRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberAuthRecordRedis.java
new file mode 100644
index 0000000000..53193bdd59
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberAuthRecordRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Component
+public class PartymemberAuthRecordRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyBranchMembersService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyBranchMembersService.java
new file mode 100644
index 0000000000..348102f417
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyBranchMembersService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
+import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+public interface PartyBranchMembersService extends BaseService<PartyBranchMembersEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PartyBranchMembersDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    PageData<PartyBranchMembersDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PartyBranchMembersDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    List<PartyBranchMembersDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PartyBranchMembersDTO
+     * @author generator
+     * @date 2020-06-17
+     */
+    PartyBranchMembersDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void save(PartyBranchMembersDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void update(PartyBranchMembersDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
new file mode 100644
index 0000000000..1087dc909b
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberAuthRecordService.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
+import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
+import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+public interface PartymemberAuthRecordService extends BaseService<PartymemberAuthRecordEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PartymemberAuthRecordDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    PageData<PartymemberAuthRecordDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PartymemberAuthRecordDTO>
+     * @author generator
+     * @date 2020-06-17
+     */
+    List<PartymemberAuthRecordDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PartymemberAuthRecordDTO
+     * @author generator
+     * @date 2020-06-17
+     */
+    PartymemberAuthRecordDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void save(PartymemberAuthRecordDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void update(PartymemberAuthRecordDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-06-17
+     */
+    void delete(String[] ids);
+
+    /**
+     * @return void
+     * @param partyMemberInfoEntity
+     * @param partymemberBaseInfoId
+     * @author yinzuomei
+     * @description 自动匹配、人工审核是党员，记录居民-党员库关系
+     * @Date 2020/6/19 13:06
+     **/
+    void insert(PartymemberInfoEntity partyMemberInfoEntity, String partymemberBaseInfoId);
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
index e317427c92..b25f8e06b0 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberBaseInfoService.java
@@ -24,8 +24,12 @@ import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 
@@ -125,4 +129,40 @@ public interface PartymemberBaseInfoService extends BaseService<PartymemberBaseI
      * @Date 2020/4/26 23:40
      **/
     Result<List<ReviewedParyMemberResultDTO>> audited(ReviewedParyMemberFormDTO formDTO);
+
+    /**
+     * @return java.lang.String
+     * @param formDTO
+     * @author yinzuomei
+     * @description 添加党员
+     * @Date 2020/6/17 22:50
+     **/
+    String addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO);
+
+    /**
+     * @return java.util.List<com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO>
+     * @param partyBranchId
+     * @author yinzuomei
+     * @description 根据党支部id,查询党员列表
+     * @Date 2020/6/18 10:17
+     **/
+    List<PartymemberBaseInfoResultDTO> listPartyMemberBaseInfo(String partyBranchId);
+
+    /**
+     * @return com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO
+     * @param partyMemberId
+     * @author yinzuomei
+     * @description 根据党员库id，查询党员信息
+     * @Date 2020/6/18 17:15
+     **/
+    PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId);
+
+    /**
+     * @param formDTO
+     * @return void
+     * @author yinzuomei
+     * @description 删除党员
+     * @Date 2020/6/18 17:35
+     **/
+    void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
new file mode 100644
index 0000000000..9297c47fbc
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyBranchMembersServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.modules.partymember.dao.PartyBranchMembersDao;
+import com.epmet.modules.partymember.entity.PartyBranchMembersEntity;
+import com.epmet.modules.partymember.redis.PartyBranchMembersRedis;
+import com.epmet.modules.partymember.service.PartyBranchMembersService;
+import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党支部党员关系表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Service
+public class PartyBranchMembersServiceImpl extends BaseServiceImpl<PartyBranchMembersDao, PartyBranchMembersEntity> implements PartyBranchMembersService {
+
+    @Autowired
+    private PartyBranchMembersRedis partyBranchMembersRedis;
+
+    @Override
+    public PageData<PartyBranchMembersDTO> page(Map<String, Object> params) {
+        IPage<PartyBranchMembersEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PartyBranchMembersDTO.class);
+    }
+
+    @Override
+    public List<PartyBranchMembersDTO> list(Map<String, Object> params) {
+        List<PartyBranchMembersEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PartyBranchMembersDTO.class);
+    }
+
+    private QueryWrapper<PartyBranchMembersEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PartyBranchMembersEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PartyBranchMembersDTO get(String id) {
+        PartyBranchMembersEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PartyBranchMembersDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PartyBranchMembersDTO dto) {
+        PartyBranchMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyBranchMembersEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PartyBranchMembersDTO dto) {
+        PartyBranchMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyBranchMembersEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index c4c661debf..a51cc29d90 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -29,7 +29,6 @@ import com.epmet.modules.feign.ResiGroupFeignClient;
 import com.epmet.modules.partymember.entity.*;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.*;
-import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant;
 import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.redis.ResiPartyMemberRedis;
@@ -49,7 +48,8 @@ import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO
 import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党员认证
@@ -68,7 +67,7 @@ import java.util.Map;
 @Service
 @Slf4j
 public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService {
-
+	private Logger logger = LoggerFactory.getLogger(getClass());
 	@Autowired
 	private EpmetUserFeignClient epmetUserFeignClient;
 	@Autowired
@@ -93,6 +92,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	private ResiPartyMemberRedis resiPartyMemberRedis;
 	@Autowired
 	private ResiGroupFeignClient resiGroupFeignClient;
+	@Autowired
+	private PartymemberAuthRecordService partymemberAuthRecordService;
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
@@ -182,7 +184,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
 		}*/
 
-		//获取党员基本信息
+		//获取党员基本信息(匹配)
 		PartymemberConfirmAutoDTO confirmAutoDTO =
 				partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
 
@@ -212,6 +214,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.AUTO_CONFIRM_SUCCESS);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
+				//记录当前居民与党员库关系，保存认证信息
+				logger.info(String.format("党员认证自动匹配成功,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),confirmAutoDTO.getPatryMemberBaseInfoId()));
+				partymemberAuthRecordService.insert(partyMemberInfoEntity,confirmAutoDTO.getPatryMemberBaseInfoId());
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
@@ -256,7 +261,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 						PartymemberConfirmAutoEntity.class));
 			}
 		}
-
+		//
 		//判断是否已注册居民，如果没有则注册居民
 		isResiRegister(partyMemberInfoDTO);
 
@@ -301,7 +306,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId());
 		partyMemberInfoEntity.setId(manualEntity.getPartymemberInfoId());
 		partyMemberInfoEntity.setConfirmResult(fromDTO.getPartyMemberFlag());
-
 		partymemberInfoService.updateById(partyMemberInfoEntity);
 
 		manualEntity.setAuditStatus(fromDTO.getPartyMemberFlag());
@@ -326,6 +330,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			identityParam.setUserId(partyMemberInfoEntity.getUserId());
 			identityParam.setPartyFlag(NumConstant.ONE_STR);
 			resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
+			//如果是自动匹配失败的，人工审核他是党员，需要记录党员库-居民的认证关系
+			PartymemberConfirmAutoDTO partymemberConfirmAutoDTO=partymemberConfirmAutoService.get(fromDTO.getAutoId());
+			if(partymemberConfirmAutoDTO!=null){
+				logger.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()));
+				partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId());
+			}
 		} else {
 			auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
 		}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
new file mode 100644
index 0000000000..0252d78942
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberAuthRecordServiceImpl.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.partymember.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.PartyMemberConstant;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
+import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
+import com.epmet.modules.partymember.redis.PartymemberAuthRecordRedis;
+import com.epmet.modules.partymember.service.PartymemberAuthRecordService;
+import com.epmet.resi.partymember.dto.partymember.PartymemberAuthRecordDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员认证记录表
+ *
+ * @author yinzuomei yinzuomei@elink-cn.com
+ * @since v1.0.0 2020-06-17
+ */
+@Service
+public class PartymemberAuthRecordServiceImpl extends BaseServiceImpl<PartymemberAuthRecordDao, PartymemberAuthRecordEntity> implements PartymemberAuthRecordService {
+    private static final Logger logger = LoggerFactory.getLogger(PartymemberAuthRecordServiceImpl.class);
+    @Autowired
+    private PartymemberAuthRecordRedis partymemberAuthRecordRedis;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+    @Override
+    public PageData<PartymemberAuthRecordDTO> page(Map<String, Object> params) {
+        IPage<PartymemberAuthRecordEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PartymemberAuthRecordDTO.class);
+    }
+
+    @Override
+    public List<PartymemberAuthRecordDTO> list(Map<String, Object> params) {
+        List<PartymemberAuthRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PartymemberAuthRecordDTO.class);
+    }
+
+    private QueryWrapper<PartymemberAuthRecordEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PartymemberAuthRecordEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PartymemberAuthRecordDTO get(String id) {
+        PartymemberAuthRecordEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PartymemberAuthRecordDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PartymemberAuthRecordDTO dto) {
+        PartymemberAuthRecordEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberAuthRecordEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PartymemberAuthRecordDTO dto) {
+        PartymemberAuthRecordEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberAuthRecordEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public void insert(PartymemberInfoEntity partyMemberInfoEntity, String partymemberBaseInfoId) {
+        PartymemberAuthRecordEntity partymemberAuthRecordEntity=new PartymemberAuthRecordEntity();
+        partymemberAuthRecordEntity.setPartymemberBaseInfoId(partymemberBaseInfoId);
+        partymemberAuthRecordEntity.setUserId(partyMemberInfoEntity.getUserId());
+        partymemberAuthRecordEntity.setAuthTime(partyMemberInfoEntity.getCreatedTime());
+        partymemberAuthRecordEntity.setCustomerId(partyMemberInfoEntity.getCustomerId());
+        partymemberAuthRecordEntity.setGridId(partyMemberInfoEntity.getGridId());
+        //日历对象
+        Calendar calendar = Calendar.getInstance();
+        //设置当前日期
+        calendar.setTime(partymemberAuthRecordEntity.getAuthTime());
+        Result<GridInfoResultDTO> result=govOrgOpenFeignClient.queryGridInfo(partymemberAuthRecordEntity.getGridId());
+        String gridName="";
+        if(result.success()&&null!=result.getData()){
+            gridName=String.format("%s-%s",result.getData().getParentAgencyName(),result.getData().getGridName());
+        }else{
+            logger.error("保存用户认证党员记录失败:查询网格名称失败");
+        }
+        partymemberAuthRecordEntity.setAuthDesc(String.format(PartyMemberConstant.AUTH_DESC,
+                calendar.get(Calendar.YEAR),
+                calendar.get(Calendar.MONTH)+1,
+                calendar.get(Calendar.DATE),
+                gridName));
+        baseDao.insert(partymemberAuthRecordEntity);
+        logger.info(String.format("保存用户认证党员记录成功:认证描述%s",partymemberAuthRecordEntity.getAuthDesc()));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index f91dc23fe7..ae51f2cc19 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -22,24 +22,38 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
+import com.epmet.commons.tools.validator.PhoneValidatorUtils;
 import com.epmet.constant.PartyMemberConstant;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
+import com.epmet.modules.partymember.dao.PartyBranchMembersDao;
+import com.epmet.modules.partymember.dao.PartymemberAuthRecordDao;
 import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
+import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
+import com.epmet.modules.partymember.service.PartyBranchMembersService;
 import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
+import com.epmet.resi.partymember.dto.partymember.PartyBranchMembersDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFormDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
 import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO;
+import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.ReviewedParyMemberResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO;
 import info.debatty.java.stringsimilarity.Levenshtein;
@@ -68,6 +82,14 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	private EpmetUserFeignClient epmetUserFeignClient;
 	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
+	@Autowired
+	private PartyBranchMembersService partyBranchMembersService;
+ 	@Autowired
+	private PartymemberAuthRecordDao partymemberAuthRecordDao;
+	@Autowired
+ 	private PartyBranchMembersDao partyBranchMembersDao;
+	@Autowired
+	private LoginUserUtil loginUserUtil;
 
 	private final static String EQUAL = "11";
 	private final static int START = 0;
@@ -116,10 +138,35 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void update(PartymemberBaseInfoDTO dto) {
+		this.checkPartymemberBaseInfoDTO(dto.getIdCard(),dto.getMobile(),dto.getId());
 		PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberBaseInfoEntity.class);
 		updateById(entity);
 	}
 
+	/**
+	 * @param idCardNo 身份证号
+	 * @param partymemberBaseInfoId       partymember_base_info表主键
+	 * @return void
+	 * @author yinzuomei
+	 * @description 校验是否可以修改党员库信息
+	 * @Date 2020/6/17 23:58
+	 **/
+	private void checkPartymemberBaseInfoDTO(String idCardNo, String mobile,String partymemberBaseInfoId) {
+		//1、手机号格式否正确
+		if (!PhoneValidatorUtils.isMobile(mobile)) {
+			throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
+		}
+		//2、判断身份证号格式是否正确 TODO
+		if(!IdCardNoValidatorUtils.checkIsIdCardNo(idCardNo)){
+			throw new RenException(EpmetErrorCode.IDCARDNO_ERROR.getCode());
+		}
+		//3、身份证不允许重复
+		List<PartymemberBaseInfoEntity> partymemberBaseInfoEntityList = baseDao.selectByIdCard(idCardNo, partymemberBaseInfoId);
+		if (null != partymemberBaseInfoEntityList&&partymemberBaseInfoEntityList.size()>0) {
+			throw new RenException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode());
+		}
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void delete(String[] ids) {
@@ -283,11 +330,12 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
 		String gridFullPath = "";
 		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
+			/*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(),
 					gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName());
 			gridFullPath = gridFullPath.replaceAll("null", "").trim();
-			gridFullPath = gridFullPath.replaceAll("--", "-").trim();
+			gridFullPath = gridFullPath.replaceAll("--", "-").trim();*/
+			gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
 		}
 		//查询居民认证信息，获取居民头像
 		List<String> userIdList = new ArrayList<>();
@@ -326,11 +374,12 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(formDTO.getGridId());
 		String gridFullPath = "";
 		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+			/*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
 					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
 			gridFullPath = gridFullPath.replaceAll("null", "").trim();
-			gridFullPath = gridFullPath.replaceAll("--", "-").trim();
+			gridFullPath = gridFullPath.replaceAll("--", "-").trim();*/
+			gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
 		}
 		//查询居民认证信息，获取居民头像
 		List<String> userIdList = new ArrayList<>();
@@ -354,6 +403,68 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		return new Result<List<ReviewedParyMemberResultDTO>>().ok(list);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String addPartyMemberBaseInfo(PartyMemberBaseInfoAddFormDTO formDTO) {
+		//校验数据
+		this.checkPartymemberBaseInfoDTO(formDTO.getIdCard(),formDTO.getMobile(),null);
+		//插入党员库记录
+		PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(formDTO, PartymemberBaseInfoEntity.class);
+		insert(entity);
+		//插入党支部-党员关系记录
+		PartyBranchMembersDTO partyBranchMembersDTO=new PartyBranchMembersDTO();
+		partyBranchMembersDTO.setBranchId(formDTO.getBranchId());
+		partyBranchMembersDTO.setPartymemberBaseInfoId(entity.getId());
+		partyBranchMembersService.save(partyBranchMembersDTO);
+		return entity.getId();
+	}
+
+	@Override
+	public List<PartymemberBaseInfoResultDTO> listPartyMemberBaseInfo(String partyBranchId) {
+		List<PartymemberBaseInfoResultDTO> resultDTOList=new ArrayList<>();
+		if(StringUtils.isNotBlank(partyBranchId)){
+			List<PartymemberBaseInfoEntity> entityList=baseDao.selectListPartyMemberBaseInfo(partyBranchId);
+			for(PartymemberBaseInfoEntity entity:entityList){
+				PartymemberBaseInfoResultDTO partymemberBaseInfoResultDTO=new PartymemberBaseInfoResultDTO();
+				partymemberBaseInfoResultDTO.setName(entity.getName());
+				partymemberBaseInfoResultDTO.setPartyMemberId(entity.getId());
+				partymemberBaseInfoResultDTO.setGender(IdCardNoValidatorUtils.getGender(entity.getIdCard()));
+				resultDTOList.add(partymemberBaseInfoResultDTO);
+			}
+		}
+		return resultDTOList;
+	}
+
+	@Override
+	public PartyMemberBaseInfoDetailResultDTO queryPartyMemberBaseInfoById(String partyMemberId) {
+		PartyMemberBaseInfoDetailResultDTO partyMemberBaseInfoDetailResultDTO = baseDao.queryPartyMemberBaseInfoById(partyMemberId);
+		if (null != partyMemberBaseInfoDetailResultDTO) {
+			//性别
+			partyMemberBaseInfoDetailResultDTO.setGender(IdCardNoValidatorUtils.getGender(partyMemberBaseInfoDetailResultDTO.getIdCard()));
+			PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(partyMemberId);
+			if (null != entity) {
+				partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.TRUE);
+				partyMemberBaseInfoDetailResultDTO.setActiveDesc(entity.getAuthDesc());
+			} else {
+				partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.FALSE);
+				partyMemberBaseInfoDetailResultDTO.setActiveDesc("");
+			}
+		}
+		return partyMemberBaseInfoDetailResultDTO;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void deltePartyMemberBaseInfo(DelPartyMemberBaseInfoFormDTO formDTO) {
+		PartymemberAuthRecordEntity entity = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId());
+		if (null != entity) {
+			throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_MEMBER.getCode());
+		}
+		this.deleteById(formDTO.getPartyMemberId());
+		partyBranchMembersDao.deletePartyBranchMember(formDTO.getPartyBranchId(),
+				formDTO.getPartyMemberId(),
+				loginUserUtil.getLoginUserId());
+	}
 
 	/**
 	 * 生成返回结果
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index 77a6eaa634..4803ebef14 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -29,7 +29,6 @@ import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
 import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
-import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.partymember.dao.PartymemberInfoDao;
@@ -159,10 +158,11 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId());
 		String gridFullPath = "";
 		if (gridInfoResult.success() && null != gridInfoResult.getData()) {
-			gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
+			/*gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(),
 					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
-			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+			gridFullPath = gridFullPath.replaceAll("--", "").trim();*/
+			gridFullPath=String.format("%s-%s",gridInfoResult.getData().getParentAgencyName(),gridInfoResult.getData().getGridName());
 		}
 		for (CertifiedResultDTO datum : listResult.getData()) {
 			datum.setGridFullPath(gridFullPath);
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
new file mode 100644
index 0000000000..a91d0feea2
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql
@@ -0,0 +1,31 @@
+CREATE TABLE `partymember_auth_record` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT 'partymember_base_info.id',
+  `USER_ID` varchar(64) NOT NULL COMMENT '认证居民id',
+  `AUTH_TIME` datetime NOT NULL COMMENT '认证时间(和partymember_info表时间一致)',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '认证网格id',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '认证客户id',
+  `AUTH_DESC` varchar(255) NOT NULL COMMENT '认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员认证记录表';
+
+
+
+CREATE TABLE `party_branch_members` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `BRANCH_ID` varchar(64) NOT NULL COMMENT '党支部id，customer_party_branch.id',
+  `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT '党员库表主键,partymember_base_info.id',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部党员关系表';
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml
new file mode 100644
index 0000000000..63cc73d5f2
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartyBranchMembersDao.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.partymember.dao.PartyBranchMembersDao">
+
+    <resultMap type="com.epmet.modules.partymember.entity.PartyBranchMembersEntity" id="partyBranchMembersMap">
+        <result property="id" column="ID"/>
+        <result property="branchId" column="BRANCH_ID"/>
+        <result property="partymemberBaseInfoId" column="PARTYMEMBER_BASE_INFO_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+    <!-- 删除党员关系 -->
+    <update id="deletePartyBranchMember" parameterType="map">
+        	update party_branch_members
+            set DEL_FLAG='1',UPDATED_TIME=NOW(),UPDATED_BY=#{userId}
+            WHERE PARTYMEMBER_BASE_INFO_ID=#{partyMemberId}
+            AND BRANCH_ID=#{partyBranchId}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
new file mode 100644
index 0000000000..f61badbc80
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberAuthRecordDao">
+
+    <resultMap type="com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity" id="partymemberAuthRecordMap">
+        <result property="id" column="ID"/>
+        <result property="partymemberBaseInfoId" column="PARTYMEMBER_BASE_INFO_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="authTime" column="AUTH_TIME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="authDesc" column="AUTH_DESC"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+    <select id="selectByPartyMemberBaseInfoId"
+            resultType="com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity"
+            parameterType="java.lang.String">
+       select * from partymember_auth_record
+        where DEL_FLAG='0'
+        and PARTYMEMBER_BASE_INFO_ID=#{partymemberBaseInfoId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 2cbad32ae0..b7aa868f90 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -120,4 +120,46 @@
             applyTime DESC
         LIMIT #{pageNo},#{pageSize}
     </select>
+
+    <!-- 根据身份证号查询党员库   -->
+    <select id="selectByIdCard" parameterType="map" resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
+        select  * from partymember_base_info
+        where DEL_FLAG='0'
+        and ID_CARD=#{idCard}
+        <if test='id != "" and id != null'>
+            and id!=#{id}
+        </if>
+    </select>
+
+    <!-- 根据党支部id，查询党员列表 -->
+    <select id="selectListPartyMemberBaseInfo" parameterType="java.lang.String" resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
+        SELECT
+            pbm.PARTYMEMBER_BASE_INFO_ID AS ID,
+            pbi.`NAME`,
+            pbi.ID_CARD
+        FROM
+            party_branch_members pbm
+            LEFT JOIN partymember_base_info pbi ON ( pbm.PARTYMEMBER_BASE_INFO_ID = pbi.id AND pbi.DEL_FLAG = '0' )
+        WHERE
+            pbm.DEL_FLAG = '0'
+            AND pbm.BRANCH_ID = #{partyBranchId}
+        ORDER BY CONVERT (pbi.`NAME` USING gbk) ASC
+    </select>
+
+    <!--    根据党员库id，查询党员信息-->
+    <select id="queryPartyMemberBaseInfoById" resultType="com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO"
+        parameterType="java.lang.String">
+        SELECT
+            pbi.id AS partyMemberId,
+            pbi.`NAME`,
+            pbi.ID_CARD AS idCard,
+            pbi.MOBILE,
+            pbm.BRANCH_ID AS partyBranchId
+        FROM
+            party_branch_members pbm
+            LEFT JOIN PARTYMEMBER_BASE_INFO pbi ON ( pbm.PARTYMEMBER_BASE_INFO_ID = pbi.ID AND pbi.DEL_FLAG = '0' )
+        WHERE
+            pbm.DEL_FLAG = '0'
+            AND pbm.PARTYMEMBER_BASE_INFO_ID = #{partyMemberId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index 5802d6a79c..10c2835084 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.11
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index abe98cfc1d..62b847b4d6 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.8
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-openapi-scan:0.3.11
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index 9bb20ac89a..8a80b425df 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.11</version>
     <artifactId>epmet-openapi-scan</artifactId>
     <packaging>jar</packaging>
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
index 6848de234f..709fc7aef4 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java
@@ -12,7 +12,6 @@ import com.aliyuncs.green.model.v20180509.TextScanRequest;
 import com.aliyuncs.http.FormatType;
 import com.aliyuncs.http.HttpResponse;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.openapi.scan.common.constant.SysConstant;
 import com.epmet.openapi.scan.common.enu.ImgSceneEnum;
 import com.epmet.openapi.scan.common.enu.SuggestionEnum;
@@ -24,9 +23,9 @@ import com.epmet.openapi.scan.support.param.ImgScanParam;
 import com.epmet.openapi.scan.support.param.ImgTask;
 import com.epmet.openapi.scan.support.param.TextScanParam;
 import com.epmet.openapi.scan.support.param.TextTask;
-import com.epmet.openapi.scan.support.result.SceneDetailResult;
 import com.epmet.openapi.scan.support.result.ImgAsyncScanResult;
 import com.epmet.openapi.scan.support.result.ScanTaskResult;
+import com.epmet.openapi.scan.support.result.SceneDetailResult;
 import com.epmet.openapi.scan.support.result.SyncScanResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpStatus;
@@ -189,14 +188,19 @@ public class ScanServiceImpl implements ScanService {
 							//如果是多个场景 则为对个 BaseScanResult
 							List<SceneDetailResult> sceneResults = taskResult.getResults();
 							//是文本检测 目前就一种场景
+							boolean isSuccess = true;
 							for (SceneDetailResult sceneResult : sceneResults) {
 								String suggestion = sceneResult.getSuggestion();
-								if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) {
-									result.getFailDataIds().add(taskResult.getDataId());
-								} else {
-									result.getSuccessDataIds().add(taskResult.getDataId());
+								if (SuggestionEnum.PASS.getCode().equals(suggestion)) {
+									isSuccess = false;
+									break;
 								}
 							}
+							if (isSuccess){
+								result.getFailDataIds().add(taskResult.getDataId());
+							} else {
+								result.getSuccessDataIds().add(taskResult.getDataId());
+							}
 						} else {
 							result.getFailDataIds().add(taskResult.getDataId());
 							log.warn("executeSyncText task process fail:code:{},msg:{}", taskResult.getCode(), taskResult.getMsg());
@@ -284,21 +288,20 @@ public class ScanServiceImpl implements ScanService {
 						}
 						//如果是多个场景 则为对个 BaseScanResult
 						List<SceneDetailResult> sceneResults = taskResult.getResults();
-						//是文本检测 目前就一种场景
+
+						boolean isSuccess = true;
 						for (SceneDetailResult sceneResult : sceneResults) {
 							String suggestion = sceneResult.getSuggestion();
 							if (SuggestionEnum.BLOCK.getCode().equals(suggestion)) {
-								if (result.getFailDataIds().contains(taskResult.getDataId())) {
-									continue;
-								}
-								result.getFailDataIds().add(taskResult.getDataId());
-							} else {
-								if (result.getSuccessDataIds().contains(taskResult.getDataId())) {
-									continue;
-								}
-								result.getSuccessDataIds().add(taskResult.getDataId());
+								isSuccess = false;
+								break;
 							}
 						}
+						if (isSuccess){
+							result.getSuccessDataIds().add(taskResult.getDataId());
+						}else{
+							result.getFailDataIds().add(taskResult.getDataId());
+						}
 					}
 					return result;
 				} else {
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
index 16ad063428..2b05d34e20 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
+++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/support/param/TextScanParam.java
@@ -26,14 +26,14 @@ public class TextScanParam implements Serializable {
 	 *
 	 * @see com.epmet.openapi.scan.common.enu.ImgSceneEnum;
 	 */
-	@Valid
-	@NotEmpty(message = "任务列表不能为空")
 	private List<String> scenes;
 
 	/**
 	 * 要检测的内容列表，必填
 	 * remark：一组任务列表中的taskId不能相同
 	 */
+	@Valid
+	@NotEmpty(message = "任务列表不能为空")
 	private List<TextTask> tasks;
 
 	/**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
index 51586242da..1708d17f32 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleResultDTO.java
@@ -34,6 +34,7 @@ public class GovStaffRoleResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private String customerId;
     /**
      * 角色ID
      */
@@ -54,6 +55,8 @@ public class GovStaffRoleResultDTO implements Serializable {
      */
 	private String roleName;
 
+	private String orgType;
+
     /**
      * 姓名
      */
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index d857fabc16..1b546e9355 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.58
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.60
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
index 1c7cf953b3..5c9f3966ff 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.58
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.59
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index ee56a0293e..7da3cceed3 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.58</version>
+    <version>0.3.60</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
new file mode 100644
index 0000000000..8b8ccd1048
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GovStaffRoleController.java
@@ -0,0 +1,43 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.RoleDTO;
+import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.GovStaffRoleTemplateDTO;
+import com.epmet.service.GovStaffRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("govstaffrole")
+@RestController
+public class GovStaffRoleController {
+
+    @Autowired
+    private GovStaffRoleService govStaffRoleService;
+
+    /**
+     * 根据客户ID查询该客户的角色列表
+     * @param customerId
+     * @return
+     */
+    @PostMapping("rolesbycustomer/{customerId}")
+    public Result listGovStaffRolesByCustomer(@PathVariable("customerId") String customerId) {
+        List<GovStaffRoleResultDTO> roleEntities = govStaffRoleService.listRolesByCustomer(customerId);
+        return new Result().ok(roleEntities);
+    }
+
+    /**
+     * 查询角色模板列表
+     * @return
+     */
+    @PostMapping("roletemplates")
+    public Result listGovStaffRoleTemplates() {
+        List<GovStaffRoleTemplateDTO> roleTemplates = govStaffRoleService.listRoleTemplates();
+        return new Result().ok(roleTemplates);
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
index 9958251e8f..e7c82100a6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RoleController.java
@@ -49,19 +49,6 @@ public class RoleController {
     @Autowired
     private RoleService roleService;
 
-    /**
-     * 根据客户ID查询该客户的角色列表
-     * @param customerId
-     * @return
-     */
-    @PostMapping("rolesbycustomer/{customerId}")
-    public Result listRolesByCustomer(@PathVariable("customerId") String customerId) {
-        List<RoleDTO> roleEntities = roleService.listRolesByCustomer(customerId);
-        return new Result().ok(roleEntities);
-    }
-
-
-
     @GetMapping("page")
     public Result<PageData<RoleDTO>> page(@RequestParam Map<String, Object> params){
         PageData<RoleDTO> page = roleService.page(params);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
index 907bb84ea1..d7562fafad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -56,4 +57,6 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      * @return
      */
     GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(@Param("customerId") String customerId, @Param("roleKey") String roleKey);
+
+    List<GovStaffRoleResultDTO> listRolesByCustomer(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
index d175c919b1..398406a8cf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java
@@ -41,11 +41,4 @@ public interface RoleDao extends BaseDao<RoleEntity> {
 	 * @return RoleEntity
 	 */
 	RoleEntity selectRoleByKey(RoleEntity param);
-
-	/**
-	 * 通过客户ID查询客户的角色列表
-	 * @param customerId
-	 * @return
-	 */
-    List<RoleDTO> listRolesByCustomer(@Param("customerId") String customerId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
index d7985c8758..25d6fe495b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java
@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 
 import java.util.List;
@@ -120,4 +121,8 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
      * @param roleKey
      */
     GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(String customerId, String roleKey);
+
+    List<GovStaffRoleResultDTO> listRolesByCustomer(String customerId);
+
+    List<GovStaffRoleTemplateDTO> listRoleTemplates();
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java
index d758c6a64b..72e055c4b1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java
@@ -99,6 +99,4 @@ public interface RoleService extends BaseService<RoleEntity> {
      * @return RoleDTO
      */
     RoleDTO getRoleByKey(RoleDTO role);
-
-    List<RoleDTO> listRolesByCustomer(String customerId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
index fb922499b5..000ea2cd40 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java
@@ -29,6 +29,7 @@ import com.epmet.dao.GovStaffRoleDao;
 import com.epmet.dao.GovStaffRoleTemplateDao;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.feign.GovAccessFeignClient;
@@ -165,4 +166,14 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     public GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(String customerId, String roleKey) {
         return govStaffRoleDao.getRoleByCustomerIdAndRoleKey(customerId, roleKey);
     }
+
+    @Override
+    public List<GovStaffRoleResultDTO> listRolesByCustomer(String customerId) {
+        return govStaffRoleDao.listRolesByCustomer(customerId);
+    }
+
+    @Override
+    public List<GovStaffRoleTemplateDTO> listRoleTemplates() {
+        return govStaffRoleTemplateDao.listValidateRoles();
+    }
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
index c95446d0dd..8322ee7226 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RoleServiceImpl.java
@@ -106,12 +106,4 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
         RoleEntity entity = baseDao.selectRoleByKey(ConvertUtils.sourceToTarget(role, RoleEntity.class));
         return ConvertUtils.sourceToTarget(entity, RoleDTO.class);
     }
-
-
-
-    @Override
-    public List<RoleDTO> listRolesByCustomer(String customerId) {
-        return baseDao.listRolesByCustomer(customerId);
-    }
-
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
index 5788da7ba8..aa495b89f5 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@@ -49,4 +49,14 @@
           AND ROLE_KEY = #{roleKey}
           AND DEL_FLAG = '0'
     </select>
+
+    <select id="listRolesByCustomer" resultType="com.epmet.dto.result.GovStaffRoleResultDTO">
+        SELECT r.ID          AS roleId,
+               r.CUSTOMER_ID AS customerId,
+               r.ROLE_KEY    AS roleKey,
+               r.ROLE_NAME   AS roleName,
+               r.ORG_TYPE    AS orgType
+        FROM gov_staff_role r
+        WHERE r.CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
index 38e35cf8c3..2bc5147051 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml
@@ -27,11 +27,4 @@
             and ROLE_KEY = #{roleKey}
             and DEL_FLAG = 0
     </select>
-
-    <select id="listRolesByCustomer" resultType="com.epmet.dto.RoleDTO">
-        SELECT r.*
-        FROM gov_staff_role r
-        WHERE r.CUSTOMER_ID = #{customerId}
-    </select>
-
 </mapper>
\ No newline at end of file