激光推送

mec-application/src/main/java/com/ym/mec/teacher/controller/UserController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "用户通讯录表")
 @RestController
 @Slf4j
-@RequestMapping("${app-config.url.student:}/user")
+@RequestMapping("${app-config.url.teacher:}/user")
 public class UserController extends BaseController {
 
 

mec-application/src/main/java/com/ym/mec/web/controller/UserController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "用户通讯录表")
 @RestController
 @Slf4j
-@RequestMapping("${app-config.url.student:}/user")
+@RequestMapping("${app-config.url.web:}/user")
 public class UserController extends BaseController {
 
 
@@ -50,7 +50,7 @@ public class UserController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        info.setUserId(user.getId().intValue());
+        info.setUserId(user.getId());
         if (info.getClient() == null) {
             info.setClient(ClientEnum.SYSTEM);
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserServiceImpl.java

@@ -167,7 +167,7 @@ public class SysUserServiceImpl implements SysUserService {
 
         UserInfoWrapper.UpdateUser userImDeviceId = teacherDao.getUserImDeviceId(info.getUserId(), ClientEnum.TEACHER.getCode());
         if (userImDeviceId != null ) {
-            if (userImDeviceId.getUserId() != null) {
+            if (userImDeviceId.getUserId() != null && StringUtils.isNotBlank(userImDeviceId.getImDeviceId())) {
                 list.add(userImDeviceId.getImDeviceId());
             } else {
                 return false;
@@ -176,7 +176,7 @@ public class SysUserServiceImpl implements SysUserService {
 
         userImDeviceId = teacherDao.getUserImDeviceId(info.getUserId(), ClientEnum.STUDENT.getCode());
         if (userImDeviceId != null ) {
-            if (userImDeviceId.getUserId() != null) {
+            if (userImDeviceId.getUserId() != null && StringUtils.isNotBlank(userImDeviceId.getImDeviceId())) {
                 list.add(userImDeviceId.getImDeviceId());
             } else {
                 return false;
@@ -184,7 +184,7 @@ public class SysUserServiceImpl implements SysUserService {
         }
         userImDeviceId = teacherDao.getUserImDeviceId(info.getUserId(), ClientEnum.SYSTEM.getCode());
         if (userImDeviceId != null ) {
-            if (userImDeviceId.getUserId() != null) {
+            if (userImDeviceId.getUserId() != null && StringUtils.isNotBlank(userImDeviceId.getImDeviceId())) {
                 list.add(userImDeviceId.getImDeviceId());
             } else {
                 return false;
@@ -192,7 +192,7 @@ public class SysUserServiceImpl implements SysUserService {
         }
         userImDeviceId = teacherDao.getUserImDeviceId(info.getUserId(), ClientEnum.SCHOOL.getCode());
         if (userImDeviceId != null ) {
-            if (userImDeviceId.getUserId() != null) {
+            if (userImDeviceId.getUserId() != null && StringUtils.isNotBlank(userImDeviceId.getImDeviceId())) {
                 list.add(userImDeviceId.getImDeviceId());
             } else {
                 return false;