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

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

@@ -216,7 +216,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 				sql.append(" 1=2 ");
 				// 继续下一步，找数据权限配置
 				List<SysUserPermission> permissionList = sysUserPermissionMapper.getUserPermissionByUserId(userId);
-				if (permissionList != null && !permissionList.isEmpty() && Common.isNotNull(menu.getCustomerId())) {
+				if (permissionList != null && !permissionList.isEmpty() ) {
 					setAuthSql(sql, "1", menu.getCustomerId(), permissionList);
 					setAuthSql(sql, "2", menu.getBussinessId(), permissionList);
 					setAuthSql(sql, "3", menu.getQuotationId(), permissionList);
@@ -225,24 +225,24 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 					setAuthSql(sql, "6", menu.getBuId(), permissionList);
 					setAuthSql(sql, "7", menu.getLineId(), permissionList);
 					setAuthSql(sql, "9", menu.getIncomeId(), permissionList);
-
 					// TODO-部门
 					setAuthSqlByDept(sql, menu.getDeptId(), permissionList);
 				}
 			}
 		}
-		if (Common.isNotNull(sql)) {
+		if (Common.isNotNull(sql) && sql.length() > 0) {
 			return " or ( " + sql + " ) ";
 		}
 		return "";
 	}
 
 	private void setAuthSql(StringBuilder sql, String type, String shuXing, List<SysUserPermission> permissionList) {
+		if (Common.isNotNull(shuXing)) {
 			StringBuilder tempValue = new StringBuilder();
 			for (SysUserPermission permission : permissionList) {
-			if (("6".equals(type) || "7".equals(type)) && type.equals(permission.getPermissionType())) {
+				if (("6".equals(type) || "7".equals(type)) && type.equals(permission.getPermissionType()) && Common.isNotNull(permission.getName())) {
 					tempValue.append("'").append(permission.getName()).append("',");
-			} else if (type.equals(permission.getPermissionType())) {
+				} else if (type.equals(permission.getPermissionType()) && Common.isNotNull(permission.getCode())) {
 					tempValue.append("'").append(permission.getCode()).append("',");
 				}
 			}
@@ -251,11 +251,13 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 			}
 			sql.append(" or (").append(shuXing).append(" in (").append(tempValue).append("))");
 		}
+	}
 
 	private void setAuthSqlByDept(StringBuilder sql, String shuXing, List<SysUserPermission> permissionList) {
+		if (Common.isNotNull(shuXing)) {
 			StringBuilder tempValue = new StringBuilder();
 			for (SysUserPermission permission : permissionList) {
-			if ("8".equals(permission.getPermissionType())) {
+				if ("8".equals(permission.getPermissionType()) && Common.isNotNull(permission.getCode())) {
 					tempValue.append("'").append(permission.getCode()).append("',");
 				}
 			}
@@ -264,6 +266,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
 			}
 			sql.append(" or (").append(shuXing).append(" in (").append(tempValue).append("))");
 		}
+	}
 
 
 	/**

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

@@ -96,7 +96,7 @@
 		SELECT
 		<include refid="Base_Column_List"/>
 		FROM sys_menu a
-		where a.DELETE_STATUS = '1' and a.PERMISSION_STATUS='0' and a.MODEL_ID = {modelId}
+		where a.DELETE_STATUS = '1' and a.PERMISSION_STATUS='0' and a.MODEL_ID = #{modelId}
 		limit 1
 	</select>