qu

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

@@ -81,10 +81,10 @@ public class ScanController {
     @GetMapping("/user/scan.html")
     public ModelAndView scan(HttpServletRequest request, ModelMap model, @RequestParam(value = "doorId", required = false, defaultValue = "0") Long doorId,
                              @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) {
-//        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
-        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
+        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
+//        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
         model.put("user", userOpen);
         model.put("user_id", "\"" + userOpen.getUserId() + "\"");
         if (list.size() == 0) {
@@ -166,10 +166,10 @@ public class ScanController {
     @ApiOperation("巡检人员检查扫码信息")
     @GetMapping("/user/scanEstate.html")
     public ModelAndView scanEstate(HttpServletRequest request, ModelMap model) {
-//        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
-        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
+        UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
+//        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
         model.put("user", userOpen);
         model.put("user_id", "\"" + userOpen.getUserId() + "\"");
         if (list.size() == 0) {