Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -54,10 +54,10 @@
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')   " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == &quot;&quot;'>" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            " JOIN sys_user su ON w.responsible_id = su.user_id  " +
            " JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')   " +
            " </if> " +
            " <where>" +
@@ -130,7 +130,7 @@
            "FROM " +
            "com_act_micro_wish w " +
            "JOIN sys_user u ON w.sponsor_id = u.user_id " +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
            "WHERE " +
            "w.id =#{id}"+
@@ -195,7 +195,7 @@
            "FROM " +
            " com_act_micro_wish AS camw " +
            " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
            " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
            " LEFT JOIN com_pb_service_team AS su1 ON su1.id = camw.responsible_id " +
            " <where> " +
            "<if test='microListDTO.status != null'>" +
            "AND camw.`status` =#{microListDTO.status}  " +