Merge branch 'LeoN' into test

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -83,6 +83,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         ResHandle<List<FosterwxCashTaskTemplate>> res = fosterwxCashTaskTemplateService.getList(postBasePageHandle);
+        if (postBasePageHandle.getType() == null) postBasePageHandle.setType(1);
         if (postBasePageHandle.getType() == 1){
             //.个微
             for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashTaskTemplateMapper.xml

@@ -25,6 +25,7 @@
             on B.template_id = A.id
         </if>
         where A.del_flg = 1
+        <if test="params.type != null">and A.template_type = #{params.type}</if>
         <if test="params.name != null">and A.template_name like concat('%',#{params.name},'%')</if>
         <if test="params.createUid != null">and A.create_uid = #{params.createUid}</if>
         <if test="params.id != null">and A.id = #{params.id}</if>