|
@@ -397,12 +397,13 @@ public class ScanController {
|
|
model.put("user", userOpen);
|
|
model.put("user", userOpen);
|
|
model.put("user_id", "\"" + userOpen.getUserId() + "\"");
|
|
model.put("user_id", "\"" + userOpen.getUserId() + "\"");
|
|
if (list.size() == 0) {
|
|
if (list.size() == 0) {
|
|
- return new ModelAndView("/user/returnWork.ftl", model);
|
|
|
|
|
|
+ return new ModelAndView("/user/home.ftl", model);
|
|
} else {
|
|
} else {
|
|
List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
|
|
List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
|
|
UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
|
|
UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
|
|
model.put("uptownId", unit.getUptownId());
|
|
model.put("uptownId", unit.getUptownId());
|
|
if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
|
|
+ model.put("tittle", "凌云");
|
|
model.put("doorplate", unit.getRidgepole() + unit.getUnit());
|
|
model.put("doorplate", unit.getRidgepole() + unit.getUnit());
|
|
model.put("name", uptownHomes.get(0).getLinkman());
|
|
model.put("name", uptownHomes.get(0).getLinkman());
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|