Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.ftl

@@ -7,6 +7,11 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
+            <#if (uptownId??) && (uptownId == 11238790987234)>
+            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
+                更改部门
+            </a>
+            </#if>
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
@@ -296,6 +301,28 @@
                     <br/><br/>
                 </div>
             </div>
+            <div id="rb_nav3" class="weui-tab__bd-item ">
+                <div class="weui-panel weui-panel_access">
+<#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
+                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
+                    <div class="weui-panel__hd" style=" font-size: large"><span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                    <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label" id="danweiTitle">更改部门</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="newUnitId">
+                                <option>请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-form__opr-area">
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定</a>
+                    </div>
+                    <br/><br/>
+                </div>
+            </div>
         </div>
     </div>
 </div>

whepi-web/src/main/java/com/bofeng/dao/UptownUnitMapper.java

@@ -40,6 +40,6 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
             "sys_uptown u ON u.uptown_id = uu.uptown_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
     UptownUnit getUptownUnitByUser(@Param("userId") Long userId);
 
-    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = 1238790987234 and unit_id > 190000 and unit_id < 191000")
+    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = 1238790987234")
     List<UptownUnit> getUptownUnitLY();
 }