Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/scan.ftl

@@ -1,4 +1,4 @@
-<#assign title="小区进出扫码"/>
+<#assign title="电子出入许可证"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -9,7 +9,6 @@
                     <br/>
                     <br/>
                     <br/>
-                    <p class="user-title-long">电子出入许可证</p>
                     <br/>
                     <br/>
                     <p class="user-title-long">${doorplate!''}

whepi-ui/templates/user/scanEstate.ftl

@@ -1,4 +1,4 @@
-<#assign title="校园公共区域巡检"/>
+<#assign title="电子出入许可证"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -9,7 +9,6 @@
                     <br/>
                     <br/>
                     <br/>
-                    <p class="user-title-long">电子出入许可证</p>
                     <br/>
                     <br/>
                     <p class="user-title-long">${doorplate!''}

whepi-web/src/main/java/com/bofeng/service/UserOpenService.java

@@ -65,6 +65,7 @@ public class UserOpenService {
         userRole.setRoleId(1);
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
+        userRole.setStatus(1);
         UptownHouse uptownHouse = new UptownHouse();
         uptownHouse.setHouseId(IdWorker.getId());
         uptownHouse.setUnitId(unitId);
@@ -82,24 +83,24 @@ public class UserOpenService {
         uptownHome.setStatus(1);
         uptownHomeMapper.insert(uptownHome);
         userRole.setPropertyId(uptownHome.getHouseId());
-        if (userType == 2) {
-            Owner owner = new Owner();
-            owner.setOwnerId(IdWorker.getId());
-            owner.setUptownId(uptownId);
-            owner.setLinkman(linkman);
-            owner.setPhone(phone);
-            owner.setUserCreate(userId);
-            owner.setUserUpdate(userId);
-            ownerMapper.insert(owner);
-            UserRole userRole1 = new UserRole();
-            userRole1.setUrId(IdWorker.getId());
-            userRole1.setUserId(userId);
-            userRole1.setRoleId(userType);
-            userRole1.setUserCreate(userId);
-            userRole1.setUserUpdate(userId);
-            userRole1.setPropertyId(owner.getOwnerId());
-            userRoleMapper.insert(userRole1);
-        }
+//        if (userType == 2) {
+//            Owner owner = new Owner();
+//            owner.setOwnerId(IdWorker.getId());
+//            owner.setUptownId(uptownId);
+//            owner.setLinkman(linkman);
+//            owner.setPhone(phone);
+//            owner.setUserCreate(userId);
+//            owner.setUserUpdate(userId);
+//            ownerMapper.insert(owner);
+//            UserRole userRole1 = new UserRole();
+//            userRole1.setUrId(IdWorker.getId());
+//            userRole1.setUserId(userId);
+//            userRole1.setRoleId(userType);
+//            userRole1.setUserCreate(userId);
+//            userRole1.setUserUpdate(userId);
+//            userRole1.setPropertyId(owner.getOwnerId());
+//            userRoleMapper.insert(userRole1);
+//        }
         userRoleMapper.insert(userRole);
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -144,7 +144,7 @@ public class ScanController {
                     model.put("collor", "red");
                     model.put("into", "禁止通行");
                     model.put("errorMsg", "健康日报提示您存在健康问题，禁止外出，请配合。");
-                    return new ModelAndView("/user/scanEstate.ftl", model);
+                    return new ModelAndView("/user/scan.ftl", model);
                 }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                 if (msReports.size() == 0) {