Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/SysUserVO.java

@@ -133,6 +133,19 @@ public class SysUserVO extends BaseEntity {
      */
     private String fullName;
 
+    /**
+     * 是否打开登录通知(1 表示是，0 表示否，默认 0)
+     */
+    private Integer isLoginNotify;
+
+    public Integer getIsLoginNotify() {
+        return isLoginNotify;
+    }
+
+    public void setIsLoginNotify(Integer isLoginNotify) {
+        this.isLoginNotify = isLoginNotify;
+    }
+
     public String getAddress() {
         return address;
     }

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

@@ -44,8 +44,14 @@ public class SysProfileController extends BaseController {
     @GetMapping
     public ApiResult profile() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Integer tenantId = loginUser.getTenantId();
         SysUserVO user = loginUser.getSysUser();
+
+        SysUserPerson one = sysUserPersonService.lambdaQuery()
+                .eq(SysUserPerson::getUserId, user.getUserId())
+                .select(SysUserPerson::getIsLoginNotify)
+                .one();
+        user.setIsLoginNotify(one.getIsLoginNotify());
+
         Map<String, Object> map = new HashMap<>();
         map.put("user", user);
         map.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -24,12 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
-            r.status, r.del_flag, r.create_time, r.remark 
+            r.status, r.del_flag, r.create_time, r.remark
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_dept d on u.dept_id = d.dept_id
-			left join sys_user_person p on u.user_id = p.user_id
     </sql>
     
     <select id="selectRoleList" parameterType="com.usky.system.domain.SysRole" resultMap="SysRoleResult">