合并代码

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml

@@ -4,9 +4,10 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*, b.nickname,b.email,b.phone,b.avatar
+        SELECT a.*, b.nickname,b.email,b.phone,b.avatar,c.organization_name
         FROM tower_project_user a
         LEFT JOIN sys_user b ON a.user_id = b.user_id
+        LEFT JOIN sys_organization c ON b.organization_id = c.organization_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml

@@ -49,9 +49,9 @@
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>
-<!--            <if test="param.username != null">-->
-<!--                AND a.username = #{param.username}-->
-<!--            </if>-->
+            <if test="param.username != null">
+                AND a.username = #{param.username}
+            </if>
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>