diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java
new file mode 100644
index 0000000..7de33f9
--- /dev/null
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/TaskSelectConstant.java
@@ -0,0 +1,12 @@
+package com.chinaunicom.zyhy.ebtp.supplier.base.constant;
+
+public class TaskSelectConstant {
+    /**
+     * 创建人 create
+     */
+    public static final String CREATE = "create";
+    /**
+     * 用户 user
+     */
+    public static final String USER = "user";
+}
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
index 1766930..56d450e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
@@ -37,13 +37,17 @@ public class OrgServiceImpl implements IOrgService {
      */
     @Override
     public SysOrg getOrgInfo(String id) {
-        return systemClient.getOrgInfo(id).getData();
+        BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(id);
+        if(!ObjectUtils.isEmpty(orgInfo.getData())){
+            return orgInfo.getData();
+        }
+        return null;
     }
 
     @Override
     public OrgDeptVo getOrgDeptInfo(String id) {
         OrgDeptVo orgDeptVo = new OrgDeptVo();
-        SysOrg dept = systemClient.getOrgInfo(id).getData();
+        SysOrg dept = getOrgInfo(id);
         if(!ObjectUtils.isEmpty(dept)){
             SysOrg org = systemClient.getOrgInfo(dept.getUpOrgId()).getData();
             if(!ObjectUtils.isEmpty(org)){
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java
index e408b10..7e51e12 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskController.java
@@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo;
@@ -34,6 +35,7 @@ public class CoscoAnnualreviewTaskController extends BaseController {
     @PostMapping("/getPage")
     public BaseResponse<IPage<CoscoAnnualreviewTaskListVo>> getPage(@ApiParam(value = "对象数据", required = true)
                                                                   @RequestBody CoscoAnnualreviewTaskListVo taskListVo) {
+        taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
         return BaseResponse.success(coscoAnnualreviewTaskService.getPage(taskListVo));
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java
index 26c3a30..1b1f998 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/controller/CoscoAnnualreviewTaskSupplierUserController.java
@@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTaskSupplierUser;
 
@@ -10,6 +11,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnual
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.*;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,7 +31,6 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
     private ICoscoAnnualreviewTaskSupplierUserService coscoAnnualreviewTaskSupplierUserService;
 
 
-
     /**
      * 获取供应商评价_年审任务供应商对应评审人详细信息
      */
@@ -57,7 +58,7 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
     /**
      * 删除供应商评价_年审任务供应商对应评审人
      */
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     public BaseResponse<Integer> remove(@PathVariable String[] ids) {
         return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.deleteCoscoAnnualreviewTaskSupplierUserByIds(ids));
     }
@@ -71,7 +72,11 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
     @ApiOperation("查询分页数据")
     @PostMapping("/getPage")
     public BaseResponse<IPage<AnnualreviewTaskSupplierUserVo>> getPage(@ApiParam(value = "对象数据", required = true)
-                                                                    @RequestBody AnnualreviewTaskSupplierUserVo userVo) {
+                                                                       @RequestBody AnnualreviewTaskSupplierUserVo userVo) {
+        //如果为按供应商查询年度审核走以下逻辑，根据任务id进行判断
+        if (StringUtils.isEmpty(userVo.getAnnualreviewTaskId())) {
+            userVo.setUserId(TokenUtil.getCurrentUser().getUserId());
+        }
         return BaseResponse.success(coscoAnnualreviewTaskSupplierUserService.getPage(userVo));
     }
 
@@ -80,12 +85,12 @@ public class CoscoAnnualreviewTaskSupplierUserController extends BaseController
      */
     @PostMapping("/addScore")
     public BaseResponse addScore(@RequestBody AnnualAddScoreVo vo) {
-        CoscoAnnualreviewTaskSupplierUser user= coscoAnnualreviewTaskSupplierUserService.selectCoscoById(vo.getId());
-        if(user.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)){
+        CoscoAnnualreviewTaskSupplierUser user = coscoAnnualreviewTaskSupplierUserService.selectCoscoById(vo.getId());
+        if (user.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)) {
             return BaseResponse.fail("当前人员已经打分，无法修改");
         }
         List<AnnualTaskIndicatorVo> scoreVoList = vo.getScoreVoList();
-        if(scoreVoList.isEmpty()){
+        if (scoreVoList.isEmpty()) {
             return BaseResponse.fail("请选择打分项");
         }
         coscoAnnualreviewTaskSupplierUserService.addScore(vo);
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
index 3d4fb0e..718d081 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/CoscoAnnualreviewTaskListVo.java
@@ -36,6 +36,7 @@ public class CoscoAnnualreviewTaskListVo implements Serializable {
 
     private String deptId;
 
+    private String createBy;
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java
index 18d624c..d747f12 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskController.java
@@ -5,6 +5,7 @@ import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
+import com.chinaunicom.zyhy.ebtp.supplier.base.constant.TaskSelectConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTask;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
@@ -38,6 +39,7 @@ public class CoscoEvaluateTaskController extends BaseController {
     @PostMapping("/getPage")
     public BaseResponse<IPage<CoscoEvaluateTaskListVo>> getPage(@ApiParam(value = "对象数据", required = true)
                                                                 @RequestBody CoscoEvaluateTaskListVo taskListVo) {
+        taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
         return BaseResponse.success(coscoEvaluateTaskService.getPage(taskListVo));
     }
 
@@ -47,6 +49,11 @@ public class CoscoEvaluateTaskController extends BaseController {
     @PostMapping("/getTaskPage")
     public BaseResponse<IPage<TaskPageVo>> getTaskPage(@ApiParam(value = "对象数据", required = true)
                                                                 @RequestBody TaskPageVo taskListVo) {
+        if(taskListVo.getSelectBy().equals(TaskSelectConstant.CREATE)){
+            taskListVo.setCreateBy(TokenUtil.getCurrentUser().getUserId());
+        }else if(taskListVo.getSelectBy().equals(TaskSelectConstant.USER)){
+            taskListVo.setUserId(TokenUtil.getCurrentUser().getUserId());
+        }
         return BaseResponse.success(coscoEvaluateTaskService.getTaskPage(taskListVo));
     }
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java
index baa889f..0d4f930 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/CoscoEvaluateTaskSupplierController.java
@@ -4,11 +4,13 @@ import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.SupplierDimensionVo;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.alibaba.excel.EasyExcelFactory;
@@ -120,6 +122,10 @@ public class CoscoEvaluateTaskSupplierController extends BaseController {
      */
     @PostMapping("/getSupplierDimension")
     public BaseResponse<IPage<SupplierDimensionVo>> getSupplierDimension(@RequestBody SupplierDimensionVo vo) {
+        //如果为按供应商查询评价任务走以下逻辑，根据任务id进行判断
+        if(StringUtils.isEmpty(vo.getTaskId())){
+            vo.setUserId(TokenUtil.getCurrentUser().getUserId());
+        }
         return BaseResponse.success(coscoEvaluateTaskSupplierService.getSupplierDimension(vo));
     }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
index 431ff4f..8953fa8 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/CoscoEvaluateTaskListVo.java
@@ -79,6 +79,10 @@ public class CoscoEvaluateTaskListVo implements Serializable {
     private String division;
 
     private List<String> taskIds;
+    /**
+     * 创建人id
+     */
+    private String createBy;
 
 
     @ApiModelProperty(value = "分页对象信息")
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
index 60d4422..c8d6fcf 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
@@ -50,6 +50,14 @@ public class TaskPageVo implements Serializable {
      * 用户id
      */
     private String userId;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 查询创建人还是用户 create 创建人， user 用户
+     */
+    private String selectBy="create";
 
     private String approveStatus;
 
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
index e6bb8bb..9f3c576 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
@@ -400,12 +400,12 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
         IPage<CoscoSupplierBase> page = new Page<>(supplierPageVo.getBasePageRequest().getPageNo(), supplierPageVo.getBasePageRequest().getPageSize());
         IPage<SupplierPageVo> supplierPage = coscoSupplierBaseMapper.getSupplierPage(page, supplierPageVo);
         supplierPage.getRecords().forEach(vo -> {
-
-            SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
-            if (orgInfo != null) {
-                vo.setDeptName(orgInfo.getOrgName());
+            if(vo.getDeptId()!=null){
+                SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
+                if (orgInfo != null) {
+                    vo.setDeptName(orgInfo.getOrgName());
+                }
             }
-
         });
         return supplierPage;
     }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
index 04714fb..933f76b 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/SupplierPageVo.java
@@ -8,7 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class SupplierPageVo {
+public class    SupplierPageVo {
 
     /**
      * 供应商ID
@@ -92,4 +92,8 @@ public class SupplierPageVo {
 
     @ApiModelProperty(value = "分页对象信息")
     private BasePageRequest basePageRequest;
+    /**
+     * 品类集合
+     */
+    private String categoryIds;
 }
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
index a040290..5c71dec 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml
@@ -237,6 +237,9 @@
             <if test="vo.status != null ">
                 and cat.status = #{vo.status}
             </if>
+            <if test="vo.createBy != null and vo.createBy!=''">
+                and cat.create_by = #{vo.createBy}
+            </if>
         </where>
         order by cat.create_time desc
     </select>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
index fa1bc22..51bb657 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
@@ -384,6 +384,9 @@
             <if test="vo.status!=null">
                 and cet.status=#{vo.status}
             </if>
+            <if test="vo.createBy!=null and vo.createBy!=null">
+                and cet.create_by = #{vo.createBy}
+            </if>
             <if test="vo.startTime!=null and vo.endTime!=null">
                 and cet.start_time between #{vo.startTime} and #{vo.endTime}
             </if>
@@ -417,6 +420,9 @@
             <if test="vo.evaluateTheme!=null and vo.evaluateTheme!=''">
                 and cet.evaluate_theme like concat('%',#{vo.evaluateTheme},'%')
             </if>
+            <if test="vo.createBy!=null and vo.createBy!=''">
+                and cet.create_by = #{vo.createBy}
+            </if>
             <if test="vo.status!=null">
                 and cet.status=#{vo.status}
             </if>
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
index 200f00f..2562057 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml
@@ -836,7 +836,8 @@
         END AS unifiedCode,
         GROUP_CONCAT(caw.dept_id) as dept_id,
         max(caw.update_time) AS admissionTime,
-        GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName
+        GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryName,
+        GROUP_CONCAT(DISTINCT cc.id SEPARATOR ', ') AS categoryIds
         from
         cosco_access_supplier_category as casc
         join cosco_supplier_base as csb on casc.supplier_id = csb.id -- 供应商已准入品类
@@ -860,6 +861,7 @@
         </if>
         )
         and csb.access_status=1
+          and casc.del_flag='normal'
         <if test="vo.name!=null and vo.name!=''">
             and csb.name like concat('%',#{vo.name},'%')
         </if>