修改新问题

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>

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>

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>