Merge branch 'system-zyj' into develop

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysProfileController.java

@@ -50,7 +50,9 @@ public class SysProfileController extends BaseController {
                 .eq(SysUserPerson::getUserId, user.getUserId())
                 .select(SysUserPerson::getIsLoginNotify)
                 .one();
-        user.setIsLoginNotify(one.getIsLoginNotify());
+        if(one != null) {
+            user.setIsLoginNotify(one.getIsLoginNotify());
+        }
 
         Map<String, Object> map = new HashMap<>();
         map.put("user", user);