Merge branch 'dev/20200513end_1.2.0' into debug

src/main/resources/mapper/SysUserMapper.xml

@@ -121,7 +121,7 @@
             </otherwise>
         </choose>
         WHERE
-        t10.roleId != -1
+        IFNULL(t10.roleId,0) != -1
         <if test="linkman != null and linkman != ''">
             and t3.linkman like CONCAT('%',#{linkman},'%')
         </if>