修改部分样式问题，改进用户列表查询问题

src/main/java/com/xzxtshiro/dao/SysUserDao.java

@@ -49,4 +49,13 @@ public interface SysUserDao {
     Integer deleteUserById(@Param("userId")String userId);
 
     SysUser selectSysUserDetailById(@Param("userId")String userId);
+
+    /**
+     * 山西特殊情况（库版本不一致导致listagg函数使用出错）
+     * @param user
+     * @return
+     */
+    List<SysUser> selectSxSysUserByCondition(SysUser user);
+
+    Integer selectSxSysUserCountByCondition(SysUser user);
 }

src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml

@@ -492,9 +492,31 @@
     <if test="userId!=null">and USERID=#{userId,jdbcType=VARCHAR}</if>
     AND id like 'H01%' ORDER BY ID
   </select>
-<!--查询用户列表-->
-  <select id="selectSysUserByCondition" resultMap="BaseResultMap">
 
+
+  <select id="queryAllUserByCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />,ROLENAME
+    from SYS_USER t
+    left join
+    (select u.user_id ,
+    listagg( roleName, ',' )  within group ( order by u.user_id ) as roleName
+    from sys_role r join  sys_user_role u on r.id=u.role_id where   u.scbz='0' and r.scbz='0' GROUP BY  u.user_id) tt
+    on t.id=tt.user_id
+    where scbz='0'
+    <if test="countycode !=null"> and UNITCODE like '%'||#{countycode}||'%'</if>
+    <if test="roleName !=null"> and ROLENAME like '%'||#{roleName}||'%'</if>
+    <if test="username !=null"> and USERNAME like '%'||#{username}||'%'</if>
+    <if test="trueName !=null"> and true_name like '%'||#{trueName}||'%'</if>
+    <if test="identitycard !=null"> and IDENTITYCARD like '%'||#{identitycard}||'%'</if>
+    <if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
+    <if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
+    <if test="sex !=null"> and sex = #sex#</if>
+    <if test="openFlag !=null"> and OPEN_FLAG = #openFlag#</if>
+  </select>
+  <!--查询用户列表-->
+  <!--其他省份-->
+  <select id="selectSysUserByCondition" resultMap="BaseResultMap">
     select * from (
     select t.*,rownum rn from (
     select
@@ -502,7 +524,7 @@
     from SYS_USER t
     left join
     (select u.user_id ,
-    xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval() as roleName
+    listagg( roleName, ',' )  within group ( order by u.user_id ) as roleName
     from sys_role r join  sys_user_role u on r.id=u.role_id where   u.scbz='0' and r.scbz='0' GROUP BY  u.user_id) tt
     on t.id=tt.user_id
     where scbz='0'
@@ -519,14 +541,38 @@
     ${limit*page}
     ) where rn > ${(page-1)*limit}
   </select>
+  <select id="selectSysUserCountByCondition" resultType="integer">
+    SELECT
+    count(1)
+    from SYS_USER t
+    left join
+    (select u.user_id ,
+    listagg( roleName, ',' )  within group ( order by u.user_id ) as roleName
+    from sys_role r join  sys_user_role u on r.id=u.role_id where   u.scbz='0' and r.scbz='0' GROUP BY  u.user_id) tt
+    on t.id=tt.user_id
+    where scbz='0'
+    <if test="countycode !=null"> and UNITCODE like '%'||#{countycode}||'%'</if>
+    <if test="roleName !=null"> and ROLENAME like '%'||#{roleName}||'%'</if>
+    <if test="username !=null"> and USERNAME like '%'||#{username}||'%'</if>
+    <if test="trueName !=null"> and true_name like '%'||#{trueName}||'%'</if>
+    <if test="identitycard !=null"> and IDENTITYCARD like '%'||#{identitycard}||'%'</if>
+    <if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
+    <if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
+    <if test="sex !=null"> and sex = #sex#</if>
+    <if test="openFlag !=null"> and OPEN_FLAG =#{openFlag,jdbcType=VARCHAR}</if>
+  </select>
 
-  <select id="queryAllUserByCondition" resultMap="BaseResultMap">
+<!--山西特殊情况-->
+
+  <select id="selectSxSysUserByCondition" resultMap="BaseResultMap">
+    select * from (
+    select t.*,rownum rn from (
     select
     <include refid="Base_Column_List" />,ROLENAME
     from SYS_USER t
     left join
     (select u.user_id ,
-    listagg( roleName, ',' )  within group ( order by u.user_id ) as roleName
+    xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval() as roleName
     from sys_role r join  sys_user_role u on r.id=u.role_id where   u.scbz='0' and r.scbz='0' GROUP BY  u.user_id) tt
     on t.id=tt.user_id
     where scbz='0'
@@ -538,11 +584,12 @@
     <if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
     <if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
     <if test="sex !=null"> and sex = #sex#</if>
-    <if test="openFlag !=null"> and OPEN_FLAG = #openFlag#</if>
+    <if test="openFlag !=null"> and OPEN_FLAG =#{openFlag,jdbcType=VARCHAR}</if>
+    ) t where ROWNUM <![CDATA[<=]]>
+    ${limit*page}
+    ) where rn > ${(page-1)*limit}
   </select>
-
-  <select id="selectSysUserCountByCondition" resultType="integer">
-    <!---->
+  <select id="selectSxSysUserCountByCondition" resultType="integer">
     SELECT
     count(1)
     from SYS_USER t

src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java

@@ -85,8 +85,20 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public BaseModel selectSysUserPage(SysUser user) {
-        List<SysUser> data = userDao.selectSysUserByCondition(user);
-        Integer count = userDao.selectSysUserCountByCondition(user);
+        String dw = user.getUnitcode();
+        List<SysUser> data = null;
+        Integer count = null;
+        if(dw!=null&&!"".equals(dw)){
+            if("14".equals(dw.substring(0,2))){
+                data = userDao.selectSxSysUserByCondition(user);
+                count = userDao.selectSxSysUserCountByCondition(user);
+            }else {
+                data = userDao.selectSysUserByCondition(user);
+                count = userDao.selectSysUserCountByCondition(user);
+            }
+
+        }
+
         BaseModel userPage = new BaseModel();
         userPage.setCount(count);
         userPage.setData(data);

src/main/resources/resource/db.properties

 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 
 jdbc.driver=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.1.109:1521:XZXT3
+jdbc.url=jdbc:oracle:thin:@192.168.1.105:1521:XZXT3
 jdbc.username=XZXT
 jdbc.password=XZXT
 

src/main/webapp/WEB-INF/jsp/admin/user/list.jsp

@@ -291,7 +291,7 @@
         form.render('select');
         form.on('switch', function(data){
             var index = layer.load(3, {shade:[0.8,'#fff'],content:'正在更新用户状态，请稍等！',time: 30*1000,success: function(layero){
-                layero.find('.layui-layer-content').css({'padding':'3px 0 0 60px','width':'200px','margin-left':'-100px'});
+                layero.find('.layui-layer-content').css({'padding':'3px 0 0 60px','width':'200px','margin-left':'-100px','color':'black'});
             }});
             var elem = $(data.elem);
             var id = elem.parents("tr").find("td[data-field='id']").text();

src/main/webapp/resources/common/css/common.css

@@ -30,3 +30,6 @@
     width: 100%;
     padding-left: 10px;
 }
+.layui-layer-dialog>.layui-layer-content{
+    color: black;
+}