diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
index 59a6b8f29..35fb90b66 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
@@ -10,6 +10,7 @@ package com.elink.esua.epdc.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
 import lombok.Data;
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
index c8cc9d182..51ab31fed 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
@@ -14,7 +14,11 @@
             LEFT JOIN sys_user u ON u.id = ru.user_id
         WHERE
             r.type_key = #{roleType} AND u.id != ''
-            AND d.id in (<foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>)
+            <if test="deptIdList.size>0 and deptIdList!=null">
+                AND d.id in (
+                <foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>
+            )
+            </if>
         GROUP BY
             d.id
     </select>
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
index cc73799f0..ba026c5a1 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
@@ -20,6 +20,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 职责分类管理
  *
@@ -28,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GridOperatorDutyCategoryDao extends BaseDao<GridOperatorDutyCategoryEntity> {
-	
-}
\ No newline at end of file
+    /**
+    * @Description: 判断权限编码是否重复
+    * @Param: [dutyCategoryName]
+    * @return: java.util.List<com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity>
+    * @Author: wk
+    * @Date: 2020/7/28
+    */
+    List<GridOperatorDutyCategoryEntity> seleCategoryName(String dutyCategoryName);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
index 27e339af9..09667c04b 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
@@ -89,6 +89,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Transactional(rollbackFor = Exception.class)
     public void save(GridOperatorDutyCategoryDTO dto) {
         GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
+       //判断权限编码是否重复dutyCategoryName权限编码
+        repetitionName(entity.getDutyCategoryName());
         insert(entity);
     }
 
@@ -96,6 +98,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
     @Transactional(rollbackFor = Exception.class)
     public void update(GridOperatorDutyCategoryDTO dto) {
         GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
+        //判断权限编码是否重复dutyCategoryName权限编码
+        repetitionName(entity.getDutyCategoryName());
         updateById(entity);
     }
 
@@ -109,5 +113,19 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
         }
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
+    /**
+    * @Description: 判断权限编码是否重复
+    * @Param: [dutyCategoryName]
+    * @return: void
+    * @Author: wk
+    * @Date: 2020/7/28
+    */
+    public void repetitionName(String dutyCategoryName){
+        List<GridOperatorDutyCategoryEntity> list = baseDao.seleCategoryName(dutyCategoryName);
+        if (null!=list && list.size()>0){
+            throw new RenException("网格专员职责类别名称重复");
+        }
+
+    }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
index 5f4e3a5f2..99f344a58 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
@@ -13,6 +13,15 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="seleCategoryName" parameterType="java.lang.String" resultMap="gridOperatorDutyCategoryMap">
+        SELECT
+            *
+        FROM
+            epdc_grid_operator_duty_category
+        WHERE
+            DEL_FLAG = 0
+            AND DUTY_CATEGORY_NAME = #{dutyCategoryName}
+    </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
index ff7518ae6..be0614e3f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
@@ -47,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("group")
 public class GroupController {
-    
+
     @Autowired
     private GroupService groupService;
 
@@ -145,7 +145,11 @@ public class GroupController {
      */
     @GetMapping("groupList")
     public Result<List<GroupListDTO>> groupList() {
-        List<GroupListDTO> data = groupService.listOfGroupByGridId(SecurityUser.getDeptId());
+        String deptId =   SecurityUser.getUser().getDeptId().toString();
+        if(null ==deptId){
+            deptId = null;
+        }
+        List<GroupListDTO> data = groupService.listOfGroupByGridId(deptId);
         return new Result<List<GroupListDTO>>().ok(data);
     }
 
@@ -181,4 +185,4 @@ public class GroupController {
         return new Result<PageData<GroupMemberDTO>>().ok(page);
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
index 7b1db6363..6a7e31a15 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
@@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
 import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.modules.group.entity.GroupEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -114,7 +115,7 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:35
      */
-    List<GroupListDTO> selectListOfGroupByGridId(Long deptId);
+    List<GroupListDTO> selectListOfGroupByGridId(@Param("deptId") String deptId);
 
     /**
      *
@@ -157,14 +158,14 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * @Date 2019/12/19 13:08
      **/
 	List<String> listPartyMemberGridId();
-	
-	/** 
-	 * @Description: 根据社群id，查询群主手机号 
-	 * @Param: [groupId] 
-	 * @return: java.lang.String 
-	 * @Author: zy 
-	 * @Date: 2020-01-08 
-	 */ 
+
+	/**
+	 * @Description: 根据社群id，查询群主手机号
+	 * @Param: [groupId]
+	 * @return: java.lang.String
+	 * @Author: zy
+	 * @Date: 2020-01-08
+	 */
 	String queryGroupUserMOBILE(String groupId);
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
index e15319a6b..b09e84fa0 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
@@ -228,7 +228,7 @@ public interface GroupService extends BaseService<GroupEntity> {
      * @author liuchuang
      * @since 2019/11/12 9:33
      */
-    List<GroupListDTO> listOfGroupByGridId(Long deptId);
+    List<GroupListDTO> listOfGroupByGridId(String deptId);
 
     /**
      *
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index bc0f431b3..9ba021a5e 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -369,7 +369,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     }
 
     @Override
-    public List<GroupListDTO> listOfGroupByGridId(Long deptId) {
+    public List<GroupListDTO> listOfGroupByGridId(String deptId) {
         return baseDao.selectListOfGroupByGridId(deptId);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index 5cedcb05b..1892f866f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -271,7 +271,7 @@ ORDER BY
             AND gp.ID = #{id}
     </select>
 
-    <select id="selectListOfGroupByGridId" resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
+    <select id="selectListOfGroupByGridId"  resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
         SELECT
             ID AS groupId,
             GROUP_NAME AS groupName
@@ -280,7 +280,9 @@ ORDER BY
         WHERE
             DEL_FLAG = '0'
             AND STATE IN ( 10, 15, 20 )
-            AND GRID_ID = #{deptId}
+            <if test="deptId!=null">
+                AND GRID_ID = #{deptId}
+            </if>
     </select>
 
     <select id="selectListOfGroupOrderByActivity" resultType="com.elink.esua.epdc.dto.group.GroupActivityDTO">
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
index db1b46944..1669d3ba5 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
@@ -11,6 +11,7 @@ package com.elink.esua.epdc.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.entity.ScheduleJobEntity;
 import com.elink.esua.epdc.utils.ScheduleUtils;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -69,8 +70,12 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobDao, Sche
 
         entity.setStatus(ScheduleStatusEnum.NORMAL.value());
         this.insert(entity);
+        try{
+            ScheduleUtils.createScheduleJob(scheduler, entity);
+        }catch (Exception e){
+            throw new RenException("请输入正确的表达式");
+        }
 
-        ScheduleUtils.createScheduleJob(scheduler, entity);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
index ad68645e7..b9b49e7a4 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
@@ -53,7 +53,7 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable {
 	/**
 	 * 考核部门类别
 	 */
-	@NotBlank(message = "考核部门类别不能为空")
+//	@NotBlank(message = "考核部门类别不能为空")
 	private String deptTypeKey;
 
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
index dfc734a36..0745c353a 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
@@ -88,8 +88,8 @@ public class UserTagServiceImpl extends BaseServiceImpl<UserTagDao, UserTagEntit
         wrapper.eq(StringUtils.isNotBlank(dto.getTagCode()), "TAG_CODE", dto.getTagCode())
                 .ne(StringUtils.isNotBlank(dto.getId()), "id", dto.getId());
         List<UserTagEntity> list = baseDao.selectList(wrapper);
-        if (null != list || list.size() > 0) {
-            return new Result().error("编码有已存在");
+        if (null != list && list.size() > 0) {
+            return new Result().error("编码已存在");
         }
         UserTagEntity entity = ConvertUtils.sourceToTarget(dto, UserTagEntity.class);