Merge remote-tracking branch 'origin/master'

house365-hgs-web/src/main/java/com/house365/web/controller/PlatformManagementController.java

@@ -194,6 +194,7 @@ public class PlatformManagementController extends BaseController {
         searchParams.put("EQ_orderBy", sortColumn.toString());
         searchParams.put("EQ_cityCode", cityCode);
         searchParams.put("EQ_isDelete", "0");
+        searchParams.put("EQ_isShowInPlat", "0");
         searchParams.put("EQ_platformCreater", userEntity.getId());
         searchParams.put("EQ_customerSourceType", "8");
         searchParams.put("EQ_platformCreateSource", "PT");

house365-hgs-ws/src/main/resources/development/ibatis/Customer.xml

@@ -1542,6 +1542,11 @@
                     star_pt_customer = 0
                     ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.isShowInPlat">
+                    <![CDATA[
+					c.is_show_in_plat $searchFilters.isShowInPlat.operation$ #searchFilters.isShowInPlat.value#
+		            ]]>
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.starCustomer">
                     <![CDATA[
                     starCustomer $searchFilters.starCustomer.operation$ #searchFilters.starCustomer.value#

house365-hgs-ws/src/main/resources/development/mybatis/CustomerMapper.xml

@@ -865,7 +865,7 @@
     </select>
 
     <update id="updateIdList"  parameterType="list">
-        update  customer set is_delete=1
+        update  customer set is_show_in_plat=1
         WHERE
         id
         <foreach collection="list" item="id" open="in (" close=")" separator=",">

house365-hgs-ws/src/main/resources/development/mybatis/UserMapper.xml

@@ -270,11 +270,12 @@
     </update>
 
     <select id="getCityById" parameterType="String" resultType="String">
-        SELECT
-        dd.`name` AS city
-        FROM `user` u
-        inner JOIN department dd on u.deptUrlPath = dd.urlPath
-        where u.id=#{userId}
+        select
+            case c.city
+            when 'zb001' then 'nj'
+            else c.city end
+            as city
+       from user u inner join city_urlpath c on SUBSTRING_INDEX(u.deptUrlPath,'/',3)=c.urlpath where u.id=#{userId}
     </select>
 
 </mapper>
\ No newline at end of file

house365-hgs-ws/src/main/resources/production/ibatis/Customer.xml

@@ -1542,6 +1542,11 @@
                     star_pt_customer = 0
                     ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.isShowInPlat">
+                    <![CDATA[
+					c.is_show_in_plat $searchFilters.isShowInPlat.operation$ #searchFilters.isShowInPlat.value#
+		            ]]>
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.starCustomer">
                     <![CDATA[
                     starCustomer $searchFilters.starCustomer.operation$ #searchFilters.starCustomer.value#

house365-hgs-ws/src/main/resources/production/mybatis/CustomerMapper.xml

@@ -858,7 +858,7 @@
     </select>
 
     <update id="updateIdList"  parameterType="list">
-        update  customer set is_delete=1
+        update  customer set is_show_in_plat=1
         WHERE
         id
         <foreach collection="list" item="id" open="in (" close=")" separator=",">

house365-hgs-ws/src/main/resources/production/mybatis/UserMapper.xml

@@ -270,11 +270,12 @@
     </update>
 
     <select id="getCityById" parameterType="String" resultType="String">
-        SELECT
-        dd.`name` AS city
-        FROM `user` u
-        inner JOIN department dd on u.deptUrlPath = dd.urlPath
-        where u.id=#{userId}
+        select
+            case c.city
+            when 'zb001' then 'nj'
+            else c.city end
+            as city
+       from user u inner join city_urlpath c on SUBSTRING_INDEX(u.deptUrlPath,'/',3)=c.urlpath where u.id=#{userId}
     </select>
 
 </mapper>
\ No newline at end of file

house365-hgs-ws/src/main/resources/test/ibatis/Customer.xml

@@ -1530,6 +1530,11 @@
                     starCustomer = 0
                     ]]>
                 </isNotEmpty>
+                <isNotEmpty prepend="AND" property="searchFilters.isShowInPlat">
+                    <![CDATA[
+					c.is_show_in_plat $searchFilters.isShowInPlat.operation$ #searchFilters.isShowInPlat.value#
+		            ]]>
+                </isNotEmpty>
                 <isNotEmpty prepend="AND" property="searchFilters.starCustomer">
                     <![CDATA[
                     starCustomer $searchFilters.starCustomer.operation$ #searchFilters.starCustomer.value#

house365-hgs-ws/src/main/resources/test/mybatis/CustomerMapper.xml

@@ -851,7 +851,7 @@
     </select>
 
     <update id="updateIdList"  parameterType="list">
-        update  customer set is_delete=1
+        update  customer set is_show_in_plat=1
         WHERE
         id
         <foreach collection="list" item="id" open="in (" close=")" separator=",">

house365-hgs-ws/src/main/resources/test/mybatis/UserMapper.xml

@@ -270,11 +270,12 @@
     </update>
 
     <select id="getCityById" parameterType="String" resultType="String">
-        SELECT
-        dd.`name` AS city
-        FROM `user` u
-        inner JOIN department dd on u.deptUrlPath = dd.urlPath
-        where u.id=#{userId}
+        select
+            case c.city
+            when 'zb001' then 'nj'
+            else c.city end
+            as city
+       from user u inner join city_urlpath c on SUBSTRING_INDEX(u.deptUrlPath,'/',3)=c.urlpath where u.id=#{userId}
     </select>
 
 </mapper>
\ No newline at end of file