得到的

C02-system/pps-core-system/src/main/java/pps/core/system/mapper/SysUserViewMapper.java

 package pps.core.system.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import pps.core.system.entity.CurrentSysUserView;
-import pps.core.system.entity.SysUserTradeView;
 import pps.core.system.entity.SysUserView;
-import pps.core.system.service.data.sys_user.GetSysUserListByOuInput;
 
 import java.util.List;
 
@@ -17,18 +13,4 @@ public interface SysUserViewMapper {
     List<SysUserView> selectList(SysUserView record);
 
     List<SysUserView> selectSysUserListByOuId(SysUserView record);
-
-    List<SysUserView> selectSysUserListByNoOuId(SysUserView record);
-
-    List<SysUserView> getSysUserListByOuId(SysUserView record);
-
-    List<SysUserView> getSysUserListByOuIds(SysUserView record);
-
-    List<SysUserTradeView> selectUserByTrade(SysUserView record);
-
-    List<SysUserView> getSysUserListByOuIds(GetSysUserListByOuInput record);
-
-    List<SysUserView> getSysUserListByOuIdOrUserName(GetSysUserListByOuInput record);
-
-    CurrentSysUserView getSysUserAndOuByUserId(@Param("userId") String userId);
 }

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserService.java

@@ -43,7 +43,6 @@ public class SysUserService {
         SysUserView record = new SysUserView();
         XCopyUtils.copyObject(input, record);
         PageHelper.startPage(input.getPage(), input.getLimit());
-        List<SysUserView> list;
         record.setEndTime(new Date());
         PpsUserSession session = context.getSession(PpsUserSession.class);
         if (BusinessConstant.ZERO.equals(session.getIsSuperAdmin())) {
@@ -51,11 +50,7 @@ public class SysUserService {
                 record.setOuId(session.getOuId());
             }
         }
-        if (ObjectUtil.isNotNull(input.getHasOuId()) && input.getHasOuId().equals(0)) {
-            record.setHasOuId(input.getHasOuId().toString());
-            list = mapper.selectSysUserListByNoOuId(record);
-        } else
-            list = mapper.selectSysUserListByOuId(record);
+        List<SysUserView> list = mapper.selectSysUserListByOuId(record);
         PageInfo<SysUserView> pageInfo = new PageInfo<>(list);
         List<QuerySysUserViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySysUserViewOutput.class);
         for (QuerySysUserViewOutput output : outputs) {

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysUserViewMapper.xml

@@ -99,7 +99,8 @@
         ID=#{id}
     </select>
 
-    <select id="selectSysUserListByOuId" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap">
+    <select id="selectSysUserListByOuId" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap"
+            databaseId="Oracle">
         SELECT
         SU.ID,
         SU.USER_NAME,
@@ -124,7 +125,7 @@
         SUOR.OU_ID,
         SO.OU_NAME,
         SU.STATUS,
-        CONCAT_WS('->',SO2.OU_NAME,SO.OU_NAME) AS CONCAT_OU_NAME
+        SO2.OU_NAME || '->' || SO.OU_NAME AS CONCAT_OU_NAME
         FROM SYS_USER SU
         LEFT JOIN SYS_USER_ORGANIZATION_REL SUOR ON SUOR.USER_ID=SU.ID
         LEFT JOIN SYS_ORGANIZATION SO ON SUOR.OU_ID=SO.ID
@@ -147,10 +148,10 @@
                 AND SU.USER_TYPE =#{userType}
             </if>
             <if test="userName != null and userName != ''">
-                AND SU.USER_NAME LIKE CONCAT('%',#{userName},'%')
+                AND SU.USER_NAME LIKE '%' || #{userName} || '%'
             </if>
             <if test="loginName != null and loginName != ''">
-                AND SU.LOGIN_NAME LIKE CONCAT('%',#{loginName},'%')
+                AND SU.LOGIN_NAME LIKE '%' || #{loginName} || '%'
             </if>
             <if test="ouIds != null and ouIds.size()>0">
                 AND SUOR.OU_ID IN
@@ -165,7 +166,8 @@
         ORDER BY SU.CREATE_TIME DESC,SU.ID DESC
     </select>
 
-    <select id="selectSysUserListByNoOuId" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap">
+    <select id="selectSysUserListByOuId" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap"
+            databaseId="MySQL">
         SELECT
         SU.ID,
         SU.USER_NAME,
@@ -197,21 +199,18 @@
         LEFT JOIN SYS_ORGANIZATION_REL SOR ON SO.ID=SOR.OU_ID
         LEFT JOIN SYS_ORGANIZATION SO2 ON SOR.PARENT_OU_ID=SO2.ID
         <where>
-            <if test="hasOuId != null and hasOuId != '' and hasOuId == '1'.toString()">
-                AND SUOR.END_TIME &gt;= #{endTime}
-                AND SOR.END_TIME &gt;= #{endTime}
-                AND SO.IS_DELETED=1
-                AND SUOR.USER_ID IS NOT NULL
-            </if>
-            <if test="hasOuId != null and hasOuId != '' and hasOuId == '0'.toString()">
-                AND SUOR.USER_ID IS NULL
-            </if>
+            SUOR.END_TIME &gt;= #{endTime}
+            AND SOR.END_TIME &gt;= #{endTime}
+            AND SO.IS_DELETED=1
             <if test="isInner != null and isInner != ''">
                 AND SU.IS_INNER =#{isInner}
             </if>
             <if test="isOuter != null and isOuter != ''">
                 AND SU.IS_OUTER =#{isOuter}
             </if>
+            <if test="ouId != null and ouId != ''">
+                AND SUOR.OU_ID =#{ouId}
+            </if>
             <if test="userType != null and userType != ''">
                 AND SU.USER_TYPE =#{userType}
             </if>
@@ -221,119 +220,16 @@
             <if test="loginName != null and loginName != ''">
                 AND SU.LOGIN_NAME LIKE CONCAT('%',#{loginName},'%')
             </if>
-            <if test="status != null and status != ''">
-                AND SU.STATUS =#{status}
-            </if>
-        </where>
-        ORDER BY SU.CREATE_TIME DESC,SU.ID DESC
-    </select>
-
-    <select id="getSysUserListByOuId" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap">
-        SELECT DISTINCT
-        SU.ID,
-        SU.USER_NAME,
-        SU.DUTY,
-        SU.PHONE
-        FROM SYS_USER SU
-        LEFT JOIN SYS_USER_ORGANIZATION_REL SUOR ON SUOR.USER_ID=SU.ID
-        <where>
-            <if test="ouId != null and ouId != ''">
-                AND SUOR.OU_ID = #{ouId}
-            </if>
-        </where>
-    </select>
-
-    <select id="getSysUserListByOuIds" parameterType="pps.core.system.entity.SysUserView" resultMap="BaseResultMap">
-        SELECT DISTINCT
-        SU.ID,
-        SU.USER_NAME,
-        SU.DUTY,
-        SU.PHONE
-        FROM SYS_USER SU
-        LEFT JOIN SYS_USER_ORGANIZATION_REL SUOR ON SUOR.USER_ID=SU.ID
-        <where>
             <if test="ouIds != null and ouIds.size()>0">
-                AND SU.PHONE IS NOT NULL AND SUOR.OU_ID IN
-                <foreach collection="ouIds" open="(" close=")" item="item" separator=",">
+                AND SUOR.OU_ID IN
+                <foreach collection="ouIds" separator="," item="item" close=")" open="(">
                     #{item}
                 </foreach>
             </if>
-        </where>
-    </select>
-
-    <select id="getSysUserListByOuIdOrUserName" parameterType="pps.core.system.entity.SysUserView"
-            resultMap="BaseResultMap">
-        SELECT DISTINCT
-        SU.ID,
-        SU.USER_NAME,
-        SU.DUTY,
-        SU.PHONE
-        FROM SYS_USER SU
-        LEFT JOIN SYS_USER_ORGANIZATION_REL SUOR ON SUOR.USER_ID=SU.ID
-        <where>
-            <if test="ouId != null and ouId !=''">
-                AND SU.PHONE IS NOT NULL AND SUOR.OU_ID =#{ouId}
-            </if>
-            <if test="userName != null and userName!= ''">
-                AND SU.USER_NAME LIKE CONCAT('%',#{userName},'%')
+            <if test="status != null and status != ''">
+                AND SU.STATUS =#{status}
             </if>
         </where>
-    </select>
-
-    <select id="selectUserByTrade" parameterType="pps.core.system.entity.SysUserView" resultMap="TradeResultMap">
-        SELECT A.USER_NAME, A.LOGIN_NAME, C.OU_NAME
-        FROM SYS_USER A,
-             SYS_USER_ORGANIZATION_REL B,
-             SYS_ORGANIZATION C
-        WHERE A.ID = B.USER_ID
-          AND B.OU_ID = C.ID
-          AND A.IS_TRADE = 1
-          AND A.USER_NAME LIKE CONCAT('%', #{userName}, '%') LIMIT 5
-    </select>
-
-    <select id="getSysUserAndOuByUserId" resultType="pps.core.system.entity.CurrentSysUserView">
-        SELECT SU.ID,
-               SU.USER_NAME,
-               SU.USER_DOMAIN,
-               SU.USER_CODE,
-               SU.USER_TYPE,
-               SU.PHONE,
-               SU.EMAIL,
-               SU.LOGIN_NAME,
-               SU.IS_SUPER_ADMIN,
-               SU.IDENTIFY_NO,
-               SU.REMARK,
-               SU.END_DATE,
-               SU.PASSWORD,
-               SU.DUTY,
-               SU.SIGN_IMAGE,
-               SU.PROMPT_MODE,
-               SU.CERT,
-               SU.SORT,
-               SU.CA_BEGIN_DATE,
-               SU.CA_END_DATE,
-               SU.IAM_LOGIN_NAME,
-               SU.LAST_LOGIN_TIME,
-               SU.JOB_DESC,
-               SU.FAX_NO,
-               SU.POSTAL_CODE,
-               SU.ADDRESS,
-               SU.CREATE_BY_ID,
-               SU.CREATE_BY_NAME,
-               SU.CREATE_TIME,
-               SU.MODIFY_BY_ID,
-               SU.MODIFY_BY_NAME,
-               SU.MODIFY_TIME,
-               SO.ID AS OU_ID,
-               SO.OU_CODE,
-               SO.OU_NAME
-        FROM SYS_USER SU
-                 LEFT JOIN SYS_USER_ORGANIZATION_REL SUOR
-                           ON SU.ID = SUOR.USER_ID
-                 LEFT JOIN SYS_ORGANIZATION SO
-                           ON SUOR.OU_ID = SO.ID
-        WHERE SU.ID = #{userId}
-          AND SUOR.END_TIME > NOW()
-          AND SO.IS_DELETED = 1
+        ORDER BY SU.CREATE_TIME DESC,SU.ID DESC
     </select>
 </mapper>
\ No newline at end of file