Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserPermission.java

@@ -39,6 +39,12 @@ public class SysUserPermission extends BaseEntity {
 	@Schema(description = "登录账号")
 	private String empLoginName;
 
+	/**
+	 * 用户id
+	 */
+	@Schema(description = "用户id")
+	private String userId;
+
 	/**
 	 * 所在部门
 	 */

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/vo/SysUserPermissionVo.java

@@ -36,6 +36,14 @@ public class SysUserPermissionVo extends RowIndex implements Serializable {
 	@Schema(description = "登录账号")
 	@ExcelProperty("登录账号")
 	private String empLoginName;
+
+	/**
+	 * 用户id
+	 */
+	@Schema(description = "用户id")
+	@ExcelAttribute(name = "用户id",isExport = false)
+	private String userId;
+
 	/**
 	 * 所属部门
 	 */

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysMenuServiceImpl.java

@@ -76,7 +76,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 		if (errorStr.length() > 0) {
 			return R.failed(errorStr.substring(0, errorStr.lastIndexOf(";")));
 		}
-		menu.setPermissionType(permissionType.substring(0, errorStr.lastIndexOf("、")));
+		menu.setPermissionType(permissionType.substring(0, permissionType.lastIndexOf("、")));
 		int res = baseMapper.insert(menu);
 		if (res <= CommonConstants.ZERO_INT) {
 			return R.failed();
@@ -95,7 +95,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 		if (errorStr.length() > 0) {
 			return R.failed(errorStr.substring(0, errorStr.lastIndexOf(";")));
 		}
-		menu.setPermissionType(permissionType.substring(0, errorStr.lastIndexOf("、")));
+		menu.setPermissionType(permissionType.substring(0, permissionType.lastIndexOf("、")));
 		baseMapper.updateById(menu);
 		return R.ok();
 	}

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java

@@ -273,6 +273,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 				SysUserInfo sysUserInfo = userInfo.get(0);
 				excel.setEmpDept(sysUserInfo.getFdDeptName());
 				excel.setEmpName(sysUserInfo.getFdName());
+				excel.setUserId(sysUserInfo.getFdId());
 				//判断表格权限类型是否正确
 				if (typeMap.isEmpty()) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "获取权限类型字典值异常", excel));

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml

@@ -31,11 +31,21 @@
     <sql id="Base_Column_List">
                 a.ID,
                 a.MENU_NAME,
+                a.MODEL_ID,
                 a.MENU_NAME_PARENT,
                 a.MENU_PARENT_ID,
                 a.PERMISSION_TYPE,
                 a.PERMISSION_STATUS,
                 a.DELETE_STATUS,
+                a.INCOME_ID,
+                a.CUSTOMER_ID,
+                a.CONTRACT_ID,
+                a.BUSSINESS_ID,
+                a.QUOTATION_ID,
+                a.DOMAIN_ID,
+                a.BU_ID,
+                a.LINE_ID,
+                a.DEPT_ID,
                 a.CREATE_TIME
     </sql>
     <sql id="sysMenu_where">