|
@@ -404,10 +404,10 @@ public class ScanController {
|
|
|
@ApiOperation("复工查询")
|
|
|
@GetMapping("/user/returnWork.html")
|
|
|
public ModelAndView returnWork(HttpServletRequest request, ModelMap model) throws ParseException {
|
|
|
-// UserOpen userOpen = homeService.getUserOpen();
|
|
|
-// List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
|
|
|
- List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
|
|
|
- UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
|
|
|
+ UserOpen userOpen = homeService.getUserOpen();
|
|
|
+ List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
|
|
|
+// List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
|
|
|
+// UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
|
|
|
model.put("user", userOpen);
|
|
|
model.put("user_id", "\"" + userOpen.getUserId() + "\"");
|
|
|
if (list.size() == 0) {
|