Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/static/js/sjcx/sjcx.js

src/main/java/im/zhaojun/common/config/ShiroConfig.java → src/main/java/im/zhaojun/common/config/RedisConfig.java

@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.Map;
 
 @Configuration
-public class ShiroConfig {
+public class RedisConfig {
 
     @Resource
     private OAuth2Helper oAuth2Helper;

src/main/resources/mapper/DeptMapper.xml

@@ -212,7 +212,7 @@
 
 
     <select id="listAllvideoIdsByDeptid" resultType="java.util.HashMap">
-      select sbbh||'_'||tdbh vidoid
+      select concat(sbbh,'_',tdbh) vidoid
        from  sbtdspsr a
         where  a.xzbh in (
        select t1.dept_id
@@ -248,7 +248,7 @@
                limit 1) "deptname",
                  (select tdmc
               from sbtdspsr c
-             where c.sbbh||'_'||tdbh = b.videoid
+             where  concat(c.sbbh,'_',tdbh) = b.videoid
                limit 1) "videoname"
       from deptdefaultvideo b
               where b.xzbh=#{deptId}
@@ -292,10 +292,10 @@
         <include refid="Base_Column_List"/>
         from
         (
-        SELECT A.sbbh || '_' || tdbh dept_id,
+        SELECT concat(A.sbbh, '_',tdbh) dept_id,
         A.tdmc dept_name,
         TO_CHAR(a.xzbh) parent_id,
-        to_number(t.levels) + 1 || '' LEVELS,
+        to_number(t.levels) + 1  LEVELS,
         (select max(order_num) from dept) + (@rownum := @rownum + 1) order_num,
         a.cjrq create_time,
         a.xgrq modify_time
@@ -321,7 +321,7 @@
                     and  a.parent_id = #{parent_id,jdbcType=INTEGER}
                 </when>
                 <otherwise>
-                    and a.parent_id||'' =0
+                    and a.parent_id =0
                 </otherwise>
             </choose>
         </where>

src/main/resources/mapper/traffdevicewriteresult.xml

@@ -16,7 +16,7 @@
         left join ptxzs p on p.xzbh = ta.xzbh
         <where>
         <if test="sbbh !=null and sbbh != ''">
-            and (ta.sbbh like '%'||#{sbbh}||'%' OR ta.tdmc like '%'||#{sbbh}||'%' OR ta.tdmcpy like '%'||#{sbbh}||'%' )
+            and (ta.sbbh like concat('%',#{sbbh},'%') OR ta.tdmc like '%'||#{sbbh}||'%' OR ta.tdmcpy like '%'||#{sbbh}||'%' )
         </if>
         <if test="xzbh !=null and xzbh != ''">
             AND ta.xzbh IN