Merge branch 'master-auto-pay' into dev

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -96,8 +96,26 @@ FROM
         SELECT
         ausw.*,
         aul.username AS `phone`,
-        IFNULL(aud.realname,aull.username) AS  `sourceName`,
-        IFNULL(audd.realname,aul.username) AS `userName`
+        (
+        CASE
+        WHEN aud.realname = "" THEN
+        aull.username
+        WHEN aud.realname IS NULL THEN
+        aull.username
+        ELSE
+        aud.realname
+        END
+        )AS  `sourceName`,
+        (
+        CASE
+        WHEN audd.realname = "" THEN
+        aul.username
+        WHEN audd.realname IS NULL THEN
+        aul.username
+        ELSE
+        audd.realname
+        END
+        )  AS `userName`
         FROM
         ( SELECT * FROM `app_user_selling_water` WHERE 1 = 1
         <if test="status !=null">